comparison TempogramPlugin.cpp @ 44:a908a5a56267

Some unsigned -> int (while bug hunting)
author Chris Cannam
date Thu, 25 Sep 2014 15:42:15 +0100
parents 4cf2d163127b
children e6a43500629b
comparison
equal deleted inserted replaced
43:4cf2d163127b 44:a908a5a56267
503 AutocorrelationProcessor autocorrelationProcessor(m_tempogramWindowLength, m_tempogramHopSize); 503 AutocorrelationProcessor autocorrelationProcessor(m_tempogramWindowLength, m_tempogramHopSize);
504 Tempogram tempogramACT = autocorrelationProcessor.process(&noveltyCurve[0], numberOfBlocks); 504 Tempogram tempogramACT = autocorrelationProcessor.process(&noveltyCurve[0], numberOfBlocks);
505 505
506 for (int block = 0; block < tempogramLength; block++){ 506 for (int block = 0; block < tempogramLength; block++){
507 Feature tempogramACTFeature; 507 Feature tempogramACTFeature;
508
509 // cerr << "block = " << block << ", window length = " << m_tempogramWindowLength << ", max lag = " << m_tempogramMaxLag << ", min lag = " << m_tempogramMinLag << endl;
508 510
509 for(int k = m_tempogramMaxLag; k >= (int)m_tempogramMinLag; k--){ 511 for(int k = m_tempogramMaxLag; k >= (int)m_tempogramMinLag; k--){
512 // cerr << "(" << block << "," << k << ") ";
510 tempogramACTFeature.values.push_back(tempogramACT[block][k]); 513 tempogramACTFeature.values.push_back(tempogramACT[block][k]);
511 } 514 }
515 // cerr << endl;
512 tempogramACTFeature.hasTimestamp = false; 516 tempogramACTFeature.hasTimestamp = false;
513 featureSet[2].push_back(tempogramACTFeature); 517 featureSet[2].push_back(tempogramACTFeature);
514 } 518 }
515 519
516 //Calculate cyclic tempogram 520 //Calculate cyclic tempogram