comparison TempogramPlugin.cpp @ 47:cb79f27f0748

Clamp cyclic tempogram min and max BPM to the BPM equivalents of the actual underlying min and max tempogram bins, rather than the "input" min and max BPM (fixed root cause of #1054)

 
 vector< vector<unsigned int> > TempogramPlugin::calculateTempogramNearestNeighbourLogBins() const
 {
     vector< vector<unsigned int> > logBins;
     
+    cerr << "calculateTempogramNearestNeighbourLogBins: octaves = "
+         << m_cyclicTempogramNumberOfOctaves << endl;
+
     for (int octave = 0; octave < (int)m_cyclicTempogramNumberOfOctaves; octave++){
         vector<unsigned int> octaveBins;
-        
+
+        cerr << "octave " << octave << ":" << endl;
+
         for (int bin = 0; bin < (int)m_cyclicTempogramOctaveDivider; bin++){
             float bpm = m_cyclicTempogramMinBPM*pow(2.0f, octave+(float)bin/m_cyclicTempogramOctaveDivider);
             octaveBins.push_back(bpmToBin(bpm));
+            cerr << bpmToBin(bpm) << " ";
             //cout << octaveBins.back() << endl;
         }
+        cerr << endl;
         logBins.push_back(octaveBins);
+
     }
     
     return logBins;
 }
 

 	     << " > max lag " << m_tempogramMaxLag
 	     << ": can't proceed, failing initialise" << endl;
 	return false;
     }
     
-    m_cyclicTempogramMinBPM = m_tempogramMinBPM;
-    float cyclicTempogramMaxBPM = m_tempogramMaxBPM;
+    m_cyclicTempogramMinBPM = max(binToBPM(m_tempogramMinBin), m_tempogramMinBPM);
+    float cyclicTempogramMaxBPM = min(binToBPM(m_tempogramMaxBin), m_tempogramMaxBPM);
+
+    cerr << "tempogram min bpm = " << m_tempogramMinBPM << ", cyclic min = "
+         << m_cyclicTempogramMinBPM << endl;
+    cerr << "tempogram max bpm = " << m_tempogramMaxBPM << ", cyclic max = "
+         << cyclicTempogramMaxBPM << endl;
 
     m_cyclicTempogramNumberOfOctaves = floor(log2(cyclicTempogramMaxBPM/m_cyclicTempogramMinBPM));
 
     if (m_cyclicTempogramNumberOfOctaves < 1) {
 	cerr << "At audio sample rate " << m_inputSampleRate