Mercurial > hg > match-vamp
diff src/Matcher.cpp @ 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 | 42381e437fcd |
line wrap: on
line diff
--- a/src/Matcher.cpp Thu Dec 04 13:05:16 2014 +0000 +++ b/src/Matcher.cpp Thu Dec 04 13:23:10 2014 +0000 @@ -25,13 +25,12 @@ //#define DEBUG_MATCHER 1 -Matcher::Matcher(Parameters parameters, Matcher *p, int m_featureSize_) : +Matcher::Matcher(Parameters parameters, Matcher *p) : m_params(parameters), - m_featureSize(m_featureSize_), m_metric(parameters.distanceNorm) { #ifdef DEBUG_MATCHER - cerr << "Matcher::Matcher(" << m_params.sampleRate << ", " << p << ", " << m_featureSize << ")" << endl; + cerr << "Matcher::Matcher(" << m_params.sampleRate << ", " << p << ")" << endl; #endif m_otherMatcher = p; // the first matcher will need this to be set later @@ -60,8 +59,7 @@ { if (m_initialised) return; - m_frames = vector<vector<double> > - (m_blockSize, vector<double>(m_featureSize, -1.0)); + m_frames = vector<vector<double> >(m_blockSize); m_distXSize = m_blockSize * 2;
