diff src/Matcher.h @ 104:6636aca831c0 feature_conditioner

Feature size is not actually needed in Matcher
author Chris Cannam
date Thu, 04 Dec 2014 13:23:10 +0000
parents 6b91e40b2c04
children 46a652da1415
line wrap: on
line diff
--- a/src/Matcher.h	Thu Dec 04 13:05:16 2014 +0000
+++ b/src/Matcher.h	Thu Dec 04 13:23:10 2014 +0000
@@ -119,11 +119,8 @@
      *  this one is going to be matched.  Some information is shared
      *  between the two matchers (currently one possesses the distance
      *  matrix and optimal path matrix).
-     *  
-     *  @param featureSize Number of values in each of the feature
-     *  vectors that will be provided.
      */
-    Matcher(Parameters parameters, Matcher *p, int featureSize);
+    Matcher(Parameters parameters, Matcher *p);
 
     /** Destructor for Matcher.
      */
@@ -165,8 +162,8 @@
      *  updating the optimal path matrix using the dynamic time
      *  warping algorithm.
      *
-     *  The supplied feature must be of the size that was passed as
-     *  featureSize to the constructor.
+     *  The supplied features must always be of the same size (within
+     *  any pair of Matcher objects).
      */
     void consumeFeatureVector(std::vector<double> feature);
     
@@ -297,9 +294,6 @@
      */
     int m_runCount;
 
-    /** The number of values in a feature vector. */
-    int m_featureSize;
-
     /** A block of previously seen feature frames is stored in this
      *  structure for calculation of the distance matrix as the new
      *  frames are received.  One can think of the structure of the