Mercurial > hg > nnls-chroma

changeset 107:ea5d533536ab monophonicness

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implemented loglikelihood stuff
author matthiasm
date Sun, 19 Dec 2010 22:01:14 +0900
parents 99b87ce4bb70
children bf894897436d
files Chordino.cpp Chordino.h
diffstat 2 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/Chordino.cpp	Sun Dec 19 21:55:01 2010 +0900
+++ b/Chordino.cpp	Sun Dec 19 22:01:14 2010 +0900
@@ -217,20 +217,20 @@
     list.push_back(d8);
     m_outputHarmonicChange = index++;
   
-    OutputDescriptor meanloglikelihood;
-    meanloglikelihood.identifier = "meanloglikelihood";
-    meanloglikelihood.name = "chord estimate mean log-likelihood";
-    meanloglikelihood.description = ".";
-    meanloglikelihood.unit = "";
-    meanloglikelihood.hasFixedBinCount = true;
-    meanloglikelihood.binCount = 1;
-    meanloglikelihood.hasKnownExtents = false;
-    meanloglikelihood.isQuantized = false;
-    meanloglikelihood.sampleType = OutputDescriptor::FixedSampleRate;
-    meanloglikelihood.hasDuration = false;
-    // meanloglikelihood.sampleRate = (m_stepSize == 0) ? m_inputSampleRate/2048 : m_inputSampleRate/m_stepSize;
-    list.push_back(meanloglikelihood);
-    m_outputMeanloglikelihood = index++;
+    OutputDescriptor loglikelihood;
+    loglikelihood.identifier = "loglikelihood";
+    loglikelihood.name = "chord estimate log-likelihood";
+    loglikelihood.description = ".";
+    loglikelihood.unit = "";
+    loglikelihood.hasFixedBinCount = true;
+    loglikelihood.binCount = 1;
+    loglikelihood.hasKnownExtents = false;
+    loglikelihood.isQuantized = false;
+    loglikelihood.sampleType = OutputDescriptor::FixedSampleRate;
+    loglikelihood.hasDuration = false;
+    // loglikelihood.sampleRate = (m_stepSize == 0) ? m_inputSampleRate/2048 : m_inputSampleRate/m_stepSize;
+    list.push_back(loglikelihood);
+    m_outputLoglikelihood = index++;
   
     return list;
 }
@@ -592,7 +592,7 @@
             loglikelihood.timestamp = timestamps[iFrame];
             loglikelihood.values.push_back(-log(scale[iFrame]));
             // cerr << chordchange[iFrame] << endl;
-            fsOut[m_outputMeanloglikelihood].push_back(loglikelihood);
+            fsOut[m_outputLoglikelihood].push_back(loglikelihood);
         }
         logscale /= nFrame;
         cerr << "loglik" << logscale << endl;
--- a/Chordino.h	Sun Dec 19 21:55:01 2010 +0900
+++ b/Chordino.h	Sun Dec 19 22:01:14 2010 +0900
@@ -48,7 +48,7 @@
     mutable int m_outputChords;
     mutable int m_outputChordnotes;
     mutable int m_outputHarmonicChange;
-    mutable int m_outputMeanloglikelihood;
+    mutable int m_outputLoglikelihood;
     vector<float> m_chorddict;
     vector<vector<int> > m_chordnotes;
     vector<string> m_chordnames;