Mercurial > hg > nnls-chroma

diff NNLSChroma.cpp @ 42:d01f94d58ef0 matthiasm-plugin

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* added new parameter that toggles NNLS
author matthiasm
date Sun, 24 Oct 2010 20:43:11 +0900
parents d6bb9b43ac1c
children 131801714118
line wrap: on
line diff
--- a/NNLSChroma.cpp	Fri Oct 22 21:43:57 2010 +0900
+++ b/NNLSChroma.cpp	Sun Oct 24 20:43:11 2010 +0900
@@ -295,7 +295,7 @@
         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 ... ";
@@ -346,7 +346,7 @@
         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;