comparison data/model/EditableDenseThreeDimensionalModel.cpp @ 843:e802e550a1f2

Drop std:: from cout, cerr, endl -- pull these in through Debug.h
author Chris Cannam
date Tue, 26 Nov 2013 13:35:08 +0000
parents 33fca917c800
children 48410857b03c
comparison
equal deleted inserted replaced
842:23d3a6eca5c3 843:e802e550a1f2
175 EditableDenseThreeDimensionalModel::truncateAndStore(size_t index, 175 EditableDenseThreeDimensionalModel::truncateAndStore(size_t index,
176 const Column &values) 176 const Column &values)
177 { 177 {
178 assert(index < m_data.size()); 178 assert(index < m_data.size());
179 179
180 //std::cout << "truncateAndStore(" << index << ", " << values.size() << ")" << std::endl; 180 //cout << "truncateAndStore(" << index << ", " << values.size() << ")" << endl;
181 181
182 // The default case is to store the entire column at m_data[index] 182 // The default case is to store the entire column at m_data[index]
183 // and place 0 at m_trunc[index] to indicate that it has not been 183 // and place 0 at m_trunc[index] to indicate that it has not been
184 // truncated. We only do clever stuff if one of the clever-stuff 184 // truncated. We only do clever stuff if one of the clever-stuff
185 // tests works out. 185 // tests works out.
272 } 272 }
273 } 273 }
274 274
275 // given += values.size(); 275 // given += values.size();
276 // stored += values.size(); 276 // stored += values.size();
277 // std::cout << "given: " << given << ", stored: " << stored << " (" 277 // cout << "given: " << given << ", stored: " << stored << " ("
278 // << ((float(stored) / float(given)) * 100.f) << "%)" << std::endl; 278 // << ((float(stored) / float(given)) * 100.f) << "%)" << endl;
279 279
280 // default case if nothing wacky worked out 280 // default case if nothing wacky worked out
281 m_data[index] = values; 281 m_data[index] = values;
282 return; 282 return;
283 } 283 }
300 int tdist = trunc; 300 int tdist = trunc;
301 if (trunc < 0) { top = false; tdist = -trunc; } 301 if (trunc < 0) { top = false; tdist = -trunc; }
302 Column p = expandAndRetrieve(index - tdist); 302 Column p = expandAndRetrieve(index - tdist);
303 int psize = p.size(), csize = c.size(); 303 int psize = p.size(), csize = c.size();
304 if (psize != m_yBinCount) { 304 if (psize != m_yBinCount) {
305 std::cerr << "WARNING: EditableDenseThreeDimensionalModel::expandAndRetrieve: Trying to expand from incorrectly sized column" << std::endl; 305 cerr << "WARNING: EditableDenseThreeDimensionalModel::expandAndRetrieve: Trying to expand from incorrectly sized column" << endl;
306 } 306 }
307 if (top) { 307 if (top) {
308 for (int i = csize; i < psize; ++i) { 308 for (int i = csize; i < psize; ++i) {
309 c.push_back(p.at(i)); 309 c.push_back(p.at(i));
310 } 310 }