Mercurial > hg > nnls-chroma

changeset 124:a17ff20fb897 darwintunes

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
made darwintunes branch
author Matthias Mauch <mail@matthiasmauch.net>
date Sat, 11 Jun 2011 17:41:23 +0100
parents b115fa66c695
children a5ee5fe71e52
files Chordino.cpp
diffstat 1 files changed, 2 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Chordino.cpp	Sat Jun 11 13:20:37 2011 +0100
+++ b/Chordino.cpp	Sat Jun 11 17:41:23 2011 +0100
@@ -220,19 +220,16 @@
     d8.hasFixedBinCount = true;
     d8.binCount = 1;
     d8.hasKnownExtents = false;
-    // d8.minValue = 0.0;
-    // d8.maxValue = 0.999;
     d8.isQuantized = false;
     d8.sampleType = OutputDescriptor::FixedSampleRate;
     d8.hasDuration = false;
-    // d8.sampleRate = (m_stepSize == 0) ? m_inputSampleRate/2048 : m_inputSampleRate/m_stepSize;
     list.push_back(d8);
     m_outputHarmonicChange = index++;
   
     OutputDescriptor loglikelihood;
     loglikelihood.identifier = "loglikelihood";
-    loglikelihood.name = "chord estimate log-likelihood";
-    loglikelihood.description = ".";
+    loglikelihood.name = "Simple Chord Log-likelihood";
+    loglikelihood.description = "Logarithm of the likelihood value of the simple chord estimate.";
     loglikelihood.unit = "";
     loglikelihood.hasFixedBinCount = true;
     loglikelihood.binCount = 1;
@@ -240,7 +237,6 @@
     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++;
   
@@ -495,12 +491,6 @@
             }
         }
 
-		if (*max_element(origchroma.begin(), origchroma.end()) == 0) {
-			for (int i = 0; i < (int)chroma.size(); i++) {
-                chroma[i] = 1;
-            }
-		}
-
         chromaList.push_back(currentChromas);
 
         // local chord estimation