Mercurial > hg > match-vamp
comparison src/Matcher.cpp @ 140:cfba9aec7569 refactors
Separate out the raw & conditioned feature outputs (previously only conditioned was available, but we want raw for our tests). Plus some optional debug output
author | Chris Cannam |
---|---|
date | Thu, 08 Jan 2015 12:11:27 +0000 |
parents | 42381e437fcd |
children | 7f6f150c1edf |
comparison
equal
deleted
inserted
replaced
139:b62dbe2ba958 | 140:cfba9aec7569 |
---|---|
28 Matcher::Matcher(Parameters parameters, Matcher *p) : | 28 Matcher::Matcher(Parameters parameters, Matcher *p) : |
29 m_params(parameters), | 29 m_params(parameters), |
30 m_metric(parameters.distanceNorm) | 30 m_metric(parameters.distanceNorm) |
31 { | 31 { |
32 #ifdef DEBUG_MATCHER | 32 #ifdef DEBUG_MATCHER |
33 cerr << "Matcher::Matcher(" << m_params.sampleRate << ", " << p << ")" << endl; | 33 cerr << "*** Matcher: distanceNorm = " << parameters.distanceNorm |
34 << ", hopTime = " << parameters.hopTime | |
35 << ", blockTime = " << parameters.blockTime | |
36 << ", maxRunCount = " << parameters.maxRunCount | |
37 << ", diagonalWeight = " << parameters.diagonalWeight << endl; | |
34 #endif | 38 #endif |
35 | 39 |
36 m_otherMatcher = p; // the first matcher will need this to be set later | 40 m_otherMatcher = p; // the first matcher will need this to be set later |
37 m_firstPM = (!p); | 41 m_firstPM = (!p); |
38 m_frameCount = 0; | 42 m_frameCount = 0; |
39 m_runCount = 0; | 43 m_runCount = 0; |
40 m_blockSize = 0; | 44 m_blockSize = 0; |