changeset 43:ae21806fe84b tony

merge -- Chris can you check whether this still does what you'd expect it to do?

--- a/LocalCandidatePYIN.cpp	Wed Jan 29 14:49:48 2014 +0000
+++ b/LocalCandidatePYIN.cpp	Thu Jan 30 18:25:28 2014 +0000
@@ -326,7 +326,7 @@
     // timestamp -> candidate number -> value
     map<RealTime, map<int, float> > featureValues;
 
-    std::cerr << "in remaining features" << std::endl;
+    // std::cerr << "in remaining features" << std::endl;
 
     if (m_pitchProb.empty()) {
         return FeatureSet();
@@ -355,6 +355,7 @@
         freqMean[iCandidate] = freqSum[iCandidate]*1.0/freqNumber[iCandidate];
     }
 
+    // find near duplicate pitch tracks
     vector<size_t> duplicates;
     for (size_t iCandidate = 0; iCandidate < m_nCandidate; ++iCandidate) {
         for (size_t jCandidate = iCandidate+1; jCandidate < m_nCandidate; ++jCandidate) {
@@ -374,6 +375,7 @@
         }
     }
 
+    // now find non-duplicate pitch tracks
     map<int, int> candidateActuals;
     map<int, std::string> candidateLabels;
 
@@ -381,7 +383,7 @@
     for (size_t iCandidate = 0; iCandidate < m_nCandidate; ++iCandidate) {
         bool isDuplicate = false;
         for (size_t i = 0; i < duplicates.size(); ++i) {
-            std::cerr << duplicates[i] << std::endl;
+            // std::cerr << duplicates[i] << std::endl;
             if (duplicates[i] == iCandidate) {
                 isDuplicate = true;
                 break;
@@ -403,12 +405,9 @@
                 }
             }
         }
-        // std::cerr << freqNumber[iCandidate] << " " << (freqSum[iCandidate]*1.0/freqNumber[iCandidate]) << std::endl;
+        // fs[m_oPitchTrackCandidates].push_back(f);
     }
 
-    // only retain those that are close to their means
-    //!!!??? what does the above mean?
-
     // adapt our features so as to return a stack of candidate values
     // per frame