Mercurial > hg > silvet
comparison src/Silvet.cpp @ 74:7133f78ccbf6 timing
Remove return of CQ output features
author | Chris Cannam |
---|---|
date | Tue, 06 May 2014 11:10:52 +0100 |
parents | 9c7e6086192d |
children | 78a7bf247016 |
comparison
equal
deleted
inserted
replaced
73:21acd34a0e3e | 74:7133f78ccbf6 |
---|---|
337 data = m_resampler->process(data.data(), data.size()); | 337 data = m_resampler->process(data.data(), data.size()); |
338 } | 338 } |
339 | 339 |
340 Grid cqout = m_cq->process(data); | 340 Grid cqout = m_cq->process(data); |
341 FeatureSet fs = transcribe(cqout); | 341 FeatureSet fs = transcribe(cqout); |
342 | 342 /* |
343 for (int i = 0; i < (int)cqout.size(); ++i) { | 343 for (int i = 0; i < (int)cqout.size(); ++i) { |
344 Feature f; | 344 Feature f; |
345 for (int j = 0; j < (int)cqout[i].size(); ++j) { | 345 for (int j = 0; j < (int)cqout[i].size(); ++j) { |
346 f.values.push_back(float(cqout[i][j])); | 346 f.values.push_back(float(cqout[i][j])); |
347 } | 347 } |
348 fs[m_cqOutputNo].push_back(f); | 348 fs[m_cqOutputNo].push_back(f); |
349 } | 349 } |
350 | 350 */ |
351 return fs; | 351 return fs; |
352 } | 352 } |
353 | 353 |
354 Silvet::FeatureSet | 354 Silvet::FeatureSet |
355 Silvet::getRemainingFeatures() | 355 Silvet::getRemainingFeatures() |
356 { | 356 { |
357 Grid cqout = m_cq->getRemainingBlocks(); | 357 Grid cqout = m_cq->getRemainingBlocks(); |
358 FeatureSet fs = transcribe(cqout); | 358 FeatureSet fs = transcribe(cqout); |
359 | 359 /* |
360 for (int i = 0; i < (int)cqout.size(); ++i) { | 360 for (int i = 0; i < (int)cqout.size(); ++i) { |
361 Feature f; | 361 Feature f; |
362 for (int j = 0; j < (int)cqout[i].size(); ++j) { | 362 for (int j = 0; j < (int)cqout[i].size(); ++j) { |
363 f.values.push_back(float(cqout[i][j])); | 363 f.values.push_back(float(cqout[i][j])); |
364 } | 364 } |
365 fs[m_cqOutputNo].push_back(f); | 365 fs[m_cqOutputNo].push_back(f); |
366 } | 366 } |
367 | 367 */ |
368 return fs; | 368 return fs; |
369 } | 369 } |
370 | 370 |
371 Silvet::FeatureSet | 371 Silvet::FeatureSet |
372 Silvet::transcribe(const Grid &cqout) | 372 Silvet::transcribe(const Grid &cqout) |