Mercurial > hg > nnls-chroma

diff NNLSChroma.cpp @ 86:e5c16976513d consonance

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implemented note output for estimated chords
author matthiasm
date Sun, 28 Nov 2010 23:10:57 +0900
parents ccc0d4b3f867
children 7af5312e66f8
line wrap: on
line diff
--- a/NNLSChroma.cpp	Thu Nov 25 02:26:52 2010 +0900
+++ b/NNLSChroma.cpp	Sun Nov 28 23:10:57 2010 +0900
@@ -430,14 +430,14 @@
         
         consonance.values.push_back(0);
         for (int iSemitone = 0; iSemitone < 84-24; ++iSemitone) {            
-            notesum += f3.values[iSemitone];
+            notesum += f3.values[iSemitone] * f3.values[iSemitone];
             float tempconsonance = 0;
             for (int jSemitone = 1; jSemitone < 24; ++jSemitone) {
                 tempconsonance += f3.values[iSemitone+jSemitone] * (consonancepattern[jSemitone]);
             }
             consonance.values[0] += (f3.values[iSemitone] * tempconsonance);
         }
-        if (notesum > 0) consonance.values[0] /= (notesum * notesum);
+        if (notesum > 0) consonance.values[0] /= notesum;
 		
         f4.values = chroma; 
         f5.values = basschroma;