Mercurial > hg > match-vamp

diff src/MatchPipeline.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 2b61e0cb6847 581b1118ec28
line wrap: on
line diff
--- a/src/MatchPipeline.cpp	Thu Jan 08 12:11:27 2015 +0000
+++ b/src/MatchPipeline.cpp	Fri Jan 16 10:18:00 2015 +0000
@@ -19,13 +19,14 @@
 
 MatchPipeline::MatchPipeline(FeatureExtractor::Parameters feParams,
 			     FeatureConditioner::Parameters fcParams,
+                             DistanceMetric::Parameters dParams,
 			     Matcher::Parameters matchParams) :
     m_fe1(feParams),
     m_fe2(feParams),
     m_fc1(fcParams),
     m_fc2(fcParams),
-    m_pm1(matchParams, 0),
-    m_pm2(matchParams, &m_pm1),
+    m_pm1(matchParams, dParams, 0),
+    m_pm2(matchParams, dParams, &m_pm1),
     m_feeder(&m_pm1, &m_pm2),
     m_lastFrameIn1(0),
     m_lastFrameIn2(0),