comparison 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
comparison
equal deleted inserted replaced
103:593054bf6476 104:6636aca831c0
117 * 117 *
118 * @param p The Matcher representing the performance with which 118 * @param p The Matcher representing the performance with which
119 * this one is going to be matched. Some information is shared 119 * this one is going to be matched. Some information is shared
120 * between the two matchers (currently one possesses the distance 120 * between the two matchers (currently one possesses the distance
121 * matrix and optimal path matrix). 121 * matrix and optimal path matrix).
122 * 122 */
123 * @param featureSize Number of values in each of the feature 123 Matcher(Parameters parameters, Matcher *p);
124 * vectors that will be provided.
125 */
126 Matcher(Parameters parameters, Matcher *p, int featureSize);
127 124
128 /** Destructor for Matcher. 125 /** Destructor for Matcher.
129 */ 126 */
130 ~Matcher(); 127 ~Matcher();
131 128
163 * Calculates the distance to all frames stored in the 160 * Calculates the distance to all frames stored in the
164 * otherMatcher and stores in the distance matrix, before 161 * otherMatcher and stores in the distance matrix, before
165 * updating the optimal path matrix using the dynamic time 162 * updating the optimal path matrix using the dynamic time
166 * warping algorithm. 163 * warping algorithm.
167 * 164 *
168 * The supplied feature must be of the size that was passed as 165 * The supplied features must always be of the same size (within
169 * featureSize to the constructor. 166 * any pair of Matcher objects).
170 */ 167 */
171 void consumeFeatureVector(std::vector<double> feature); 168 void consumeFeatureVector(std::vector<double> feature);
172 169
173 /** Tests whether a location is in range in the minimum cost matrix. 170 /** Tests whether a location is in range in the minimum cost matrix.
174 * 171 *
295 /** The number of frames sequentially processed by this matcher, 292 /** The number of frames sequentially processed by this matcher,
296 * without a frame of the other matcher being processed. 293 * without a frame of the other matcher being processed.
297 */ 294 */
298 int m_runCount; 295 int m_runCount;
299 296
300 /** The number of values in a feature vector. */
301 int m_featureSize;
302
303 /** A block of previously seen feature frames is stored in this 297 /** A block of previously seen feature frames is stored in this
304 * structure for calculation of the distance matrix as the new 298 * structure for calculation of the distance matrix as the new
305 * frames are received. One can think of the structure of the 299 * frames are received. One can think of the structure of the
306 * array as a circular buffer of vectors. */ 300 * array as a circular buffer of vectors. */
307 vector<vector<double> > m_frames; 301 vector<vector<double> > m_frames;