comparison src/Silvet.cpp @ 186:9d70d687e4eb noteagent

Tidy column counting

         if (!present[i]) {
             // silent column
             for (int j = 0; j < pack.templateNoteCount; ++j) {
                 m_postFilter[j]->push(0.0);
             }
-            continue;
-        }
-
-        postProcess(localPitches[i], localBestShifts[i], 
-                    wantShifts, shiftCount);
+        } else {
+
+            postProcess(localPitches[i], localBestShifts[i], 
+                        wantShifts, shiftCount);
         
-        FeatureList noteFeatures = obtainNotes();
-
-        for (FeatureList::const_iterator fi = noteFeatures.begin();
-             fi != noteFeatures.end(); ++fi) {
-            fs[m_notesOutputNo].push_back(*fi);
-        }
+            FeatureList noteFeatures = obtainNotes();
+
+            for (FeatureList::const_iterator fi = noteFeatures.begin();
+                 fi != noteFeatures.end(); ++fi) {
+                fs[m_notesOutputNo].push_back(*fi);
+            }
+        }
+
+        ++m_columnCountOut;
     }
 
     return fs;
 }
 

         if (confidence > 1.0) confidence = 1.0;
 
         AgentHypothesis::Observation obs(freq, t, confidence);
         m_agentFeeder->feed(obs);
     }
-
-    m_columnCountOut ++;
 }
 
 Vamp::Plugin::FeatureList
 Silvet::obtainNotes()
 {