Mercurial > hg > match-vamp

diff test/TestDistanceMetric.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 af69db43f5a4
children 214b72d55796
line wrap: on
line diff
--- a/test/TestDistanceMetric.cpp	Thu Jan 08 12:11:27 2015 +0000
+++ b/test/TestDistanceMetric.cpp	Fri Jan 16 10:18:00 2015 +0000
@@ -26,7 +26,9 @@
 
 BOOST_AUTO_TEST_CASE(nonorm)
 {
-    DistanceMetric dm(DistanceMetric::NoDistanceNormalisation);
+    DistanceMetric::Parameters params;
+    params.norm = DistanceMetric::NoDistanceNormalisation;
+    DistanceMetric dm(params);
     vector<double>
 	e1 = getTestFeature(1),
 	e2 = getTestFeature(2),
@@ -42,7 +44,9 @@
 
 BOOST_AUTO_TEST_CASE(sum)
 {
-    DistanceMetric dm(DistanceMetric::NormaliseDistanceToSum);
+    DistanceMetric::Parameters params;
+    params.norm = DistanceMetric::NormaliseDistanceToSum;
+    DistanceMetric dm(params);
     vector<double>
 	e1 = getTestFeature(1),
 	e2 = getTestFeature(2),