comparison NNLSChroma.cpp @ 42:d01f94d58ef0 matthiasm-plugin

* added new parameter that toggles NNLS

         Semitone-spaced log-frequency spectrum derived from the tuned log-freq spectrum above. the spectrum
         is inferred using a non-negative least squares algorithm.
         Three different kinds of chromagram are calculated, "treble", "bass", and "both" (which means 
         bass and treble stacked onto each other).
     **/
-    if (m_dictID == 1) {
+    if (m_useNNLS == 0) {
         cerr << "[NNLS Chroma Plugin] Mapping to semitone spectrum and chroma ... ";
     } else {
         cerr << "[NNLS Chroma Plugin] Performing NNLS and mapping to chroma ... ";
     }
 

         vector<float> basschroma = vector<float>(12, 0);
         float currval;
         unsigned iSemitone = 0;
 			
         if (some_b_greater_zero) {
-            if (m_dictID == 1) {
+            if (m_useNNLS == 0) {
                 for (unsigned iNote = 2; iNote < nNote - 2; iNote += 3) {
                     currval = 0;
                     currval += b[iNote + 1 + -1] * 0.5;						
                     currval += b[iNote + 1 +  0] * 1.0;						
                     currval += b[iNote + 1 +  1] * 0.5;