comparison data/fileio/CSVFormat.cpp @ 1450:a12fd0456f0c streaming-csv-writer

Merge from default branch
author Chris Cannam
date Tue, 17 Apr 2018 10:35:42 +0100
parents 48e9f538e6e9
children 5f1b2a117a4f
comparison
equal deleted inserted replaced
1449:deabf9fd3d28 1450:a12fd0456f0c
112 112
113 ColumnQualities defaultQualities = 113 ColumnQualities defaultQualities =
114 ColumnNumeric | ColumnIntegral | ColumnIncreasing | ColumnNearEmpty; 114 ColumnNumeric | ColumnIntegral | ColumnIncreasing | ColumnNearEmpty;
115 115
116 for (int i = 0; i < cols; ++i) { 116 for (int i = 0; i < cols; ++i) {
117 117
118 while (m_columnQualities.size() <= i) { 118 while (m_columnQualities.size() <= i) {
119 m_columnQualities.push_back(defaultQualities); 119 m_columnQualities.push_back(defaultQualities);
120 m_prevValues.push_back(0.f); 120 m_prevValues.push_back(0.f);
121 } 121 }
122 122
195 void 195 void
196 CSVFormat::guessPurposes() 196 CSVFormat::guessPurposes()
197 { 197 {
198 m_timingType = CSVFormat::ImplicitTiming; 198 m_timingType = CSVFormat::ImplicitTiming;
199 m_timeUnits = CSVFormat::TimeWindows; 199 m_timeUnits = CSVFormat::TimeWindows;
200 200
201 int timingColumnCount = 0; 201 int timingColumnCount = 0;
202 202
203 // if our first column has zero or one entries in it and the rest 203 // if our first column has zero or one entries in it and the rest
204 // have more, then we'll default to ignoring the first column and 204 // have more, then we'll default to ignoring the first column and
205 // counting the next one as primary. (e.g. Sonic Annotator output 205 // counting the next one as primary. (e.g. Sonic Annotator output