Mercurial > hg > svcore

changeset 778:d373ced0e6e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
outputFeatureNo -> outputNo
author Chris Cannam
date Wed, 27 Mar 2013 15:07:27 +0000
parents eea8049df526
children 15cd67fcbdad
files data/model/SparseModel.h transform/FeatureExtractionModelTransformer.cpp transform/FeatureExtractionModelTransformer.h
diffstat 3 files changed, 10 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/data/model/SparseModel.h	Wed Mar 27 14:51:49 2013 +0000
+++ b/data/model/SparseModel.h	Wed Mar 27 15:07:27 2013 +0000
@@ -407,7 +407,7 @@
         PointListIterator i = i0;
 
         for (i = i0; i != i1; ++i) {
-            if (i->frame < frame) { continue; }
+            if (i->frame < (int)frame) { continue; }
             if (indexAtFrame > 0) { --indexAtFrame; continue; }
             return i;
         }
@@ -436,7 +436,7 @@
         PointListConstIterator i = i0;
 
         for (i = i0; i != i1; ++i) {
-            if (i->frame < frame) { continue; }
+            if (i->frame < (int)frame) { continue; }
             if (indexAtFrame > 0) { --indexAtFrame; continue; }
             return i;
         }
--- a/transform/FeatureExtractionModelTransformer.cpp	Wed Mar 27 14:51:49 2013 +0000
+++ b/transform/FeatureExtractionModelTransformer.cpp	Wed Mar 27 15:07:27 2013 +0000
@@ -41,7 +41,7 @@
     ModelTransformer(in, transform),
     m_plugin(0),
     m_descriptor(0),
-    m_outputFeatureNo(0)
+    m_outputNo(0)
 {
 //    SVDEBUG << "FeatureExtractionModelTransformer::FeatureExtractionModelTransformer: plugin " << pluginId << ", outputName " << m_transform.getOutput() << endl;
 
@@ -155,7 +155,7 @@
 //        SVDEBUG << "comparing output " << i << " name \"" << outputs[i].identifier << "\" with expected \"" << m_transform.getOutput() << "\"" << endl;
 	if (m_transform.getOutput() == "" ||
             outputs[i].identifier == m_transform.getOutput().toStdString()) {
-	    m_outputFeatureNo = i;
+	    m_outputNo = i;
 	    m_descriptor = new Vamp::Plugin::OutputDescriptor(outputs[i]);
 	    break;
 	}
@@ -339,7 +339,7 @@
         }
 
         Vamp::Plugin::OutputList outputs = m_plugin->getOutputDescriptors();
-        model->setScaleUnits(outputs[m_outputFeatureNo].unit.c_str());
+        model->setScaleUnits(outputs[m_outputNo].unit.c_str());
 
         m_output = model;
 
@@ -534,9 +534,8 @@
 
         if (m_abandoned) break;
 
-	for (size_t fi = 0; fi < features[m_outputFeatureNo].size(); ++fi) {
-	    Vamp::Plugin::Feature feature =
-		features[m_outputFeatureNo][fi];
+	for (size_t fi = 0; fi < features[m_outputNo].size(); ++fi) {
+	    Vamp::Plugin::Feature feature = features[m_outputNo][fi];
 	    addFeature(blockFrame, feature);
 	}
 
@@ -551,9 +550,8 @@
     if (!m_abandoned) {
         Vamp::Plugin::FeatureSet features = m_plugin->getRemainingFeatures();
 
-        for (size_t fi = 0; fi < features[m_outputFeatureNo].size(); ++fi) {
-            Vamp::Plugin::Feature feature =
-                features[m_outputFeatureNo][fi];
+        for (size_t fi = 0; fi < features[m_outputNo].size(); ++fi) {
+            Vamp::Plugin::Feature feature = features[m_outputNo][fi];
             addFeature(blockFrame, feature);
         }
     }
--- a/transform/FeatureExtractionModelTransformer.h	Wed Mar 27 14:51:49 2013 +0000
+++ b/transform/FeatureExtractionModelTransformer.h	Wed Mar 27 15:07:27 2013 +0000
@@ -40,7 +40,7 @@
 
     Vamp::Plugin *m_plugin;
     Vamp::Plugin::OutputDescriptor *m_descriptor;
-    int m_outputFeatureNo;
+    int m_outputNo;
 
     void createOutputModel();