comparison Chordino.cpp @ 124:a17ff20fb897 darwintunes

made darwintunes branch

     d8.description = "An indication of the likelihood of harmonic change. Depends on the chord dictionary. Calculation is different depending on whether the Viterbi algorithm is used for chord estimation, or the simple chord estimate.";
     d8.unit = "";
     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;
     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;
 }

                 for (int i = 0; i < (int)chroma.size(); i++) {
                     currentChromas.values[i] /= chromanorm[2];
                 }
             }
         }
-
-		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
         vector<double> currentChordSalience;