Mercurial > hg > silvet

changeset 186:9d70d687e4eb noteagent

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tidy column counting
author Chris Cannam
date Wed, 28 May 2014 15:05:43 +0100
parents 78212f764251
children 1697457458b7
files src/Silvet.cpp
diffstat 1 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/Silvet.cpp	Wed May 28 14:56:01 2014 +0100
+++ b/src/Silvet.cpp	Wed May 28 15:05:43 2014 +0100
@@ -534,18 +534,20 @@
             for (int j = 0; j < pack.templateNoteCount; ++j) {
                 m_postFilter[j]->push(0.0);
             }
-            continue;
+        } 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);
+            }
         }
 
-        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);
-        }
+        ++m_columnCountOut;
     }
 
     return fs;
@@ -677,8 +679,6 @@
         AgentHypothesis::Observation obs(freq, t, confidence);
         m_agentFeeder->feed(obs);
     }
-
-    m_columnCountOut ++;
 }
 
 Vamp::Plugin::FeatureList