Mercurial > hg > nnls-chroma

diff chromamethods.cpp @ 48:6e76c7710fa1 matthiasm-plugin

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed subtraction in chroma dictionary, added to-the-power-of-1.5 in chordino
author matthiasm
date Mon, 25 Oct 2010 16:58:32 +0900
parents 109d3b2c7105
children 08d24cc21312
line wrap: on
line diff
--- a/chromamethods.cpp	Mon Oct 25 02:33:47 2010 +0900
+++ b/chromamethods.cpp	Mon Oct 25 16:58:32 2010 +0900
@@ -378,6 +378,7 @@
         //      
         // }
         
+        float exponent = 2.0;
         
         for (int iChord = 0; iChord < loadedChordDict.size()/24; iChord++) {
             float sum = 0;
@@ -386,10 +387,10 @@
                 sum += loadedChordDict[24 * iChord + iST];
             }
             for (int iST = 0; iST < 24; ++iST) {
-                loadedChordDict[24 * iChord + iST] -= sum/24;
-                stand += pow(loadedChordDict[24 * iChord + iST],2)/24;
+                // loadedChordDict[24 * iChord + iST] -= sum/24;
+                stand += pow(abs(loadedChordDict[24 * iChord + iST]),exponent)/24;
             }
-            stand = sqrt(stand);
+            stand = pow(stand,(float)1.0/exponent);
             for (int iST = 0; iST < 24; ++iST) {
                 loadedChordDict[24 * iChord + iST] /= stand;            
             }