Mercurial > hg > match-vamp

diff src/Matcher.cpp @ 143:6914a6a01ffc refactors

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Transplant the distance metric parameter structure from silence_penalty branch (even though normalisation is currently the only thing in it)
author Chris Cannam
date Fri, 16 Jan 2015 10:18:00 +0000
parents cfba9aec7569
children 4159f6b71942
line wrap: on
line diff
--- a/src/Matcher.cpp	Thu Jan 08 12:11:27 2015 +0000
+++ b/src/Matcher.cpp	Fri Jan 16 10:18:00 2015 +0000
@@ -25,13 +25,13 @@
 
 //#define DEBUG_MATCHER 1
 
-Matcher::Matcher(Parameters parameters, Matcher *p) :
+Matcher::Matcher(Parameters parameters, DistanceMetric::Parameters dparams,
+                 Matcher *p) :
     m_params(parameters),
-    m_metric(parameters.distanceNorm)
+    m_metric(dparams)
 {
 #ifdef DEBUG_MATCHER
-    cerr << "*** Matcher: distanceNorm = " << parameters.distanceNorm
-         << ", hopTime = " << parameters.hopTime
+    cerr << "*** Matcher: hopTime = " << parameters.hopTime
          << ", blockTime = " << parameters.blockTime
          << ", maxRunCount = " << parameters.maxRunCount
          << ", diagonalWeight = " << parameters.diagonalWeight << endl;