Mercurial > hg > match-vamp

comparison 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
comparison
equal deleted inserted replaced
140:cfba9aec7569 143:6914a6a01ffc
24 24
25 BOOST_AUTO_TEST_SUITE(TestDistanceMetric) 25 BOOST_AUTO_TEST_SUITE(TestDistanceMetric)
26 26
27 BOOST_AUTO_TEST_CASE(nonorm) 27 BOOST_AUTO_TEST_CASE(nonorm)
28 { 28 {
29 DistanceMetric dm(DistanceMetric::NoDistanceNormalisation); 29 DistanceMetric::Parameters params;
30 params.norm = DistanceMetric::NoDistanceNormalisation;
31 DistanceMetric dm(params);
30 vector<double> 32 vector<double>
31 e1 = getTestFeature(1), 33 e1 = getTestFeature(1),
32 e2 = getTestFeature(2), 34 e2 = getTestFeature(2),
33 e0 = getTestFeature(0); 35 e0 = getTestFeature(0);
34 36
40 BOOST_CHECK_EQUAL(dm.calcDistance(e0, e2), 12.0); 42 BOOST_CHECK_EQUAL(dm.calcDistance(e0, e2), 12.0);
41 } 43 }
42 44
43 BOOST_AUTO_TEST_CASE(sum) 45 BOOST_AUTO_TEST_CASE(sum)
44 { 46 {
45 DistanceMetric dm(DistanceMetric::NormaliseDistanceToSum); 47 DistanceMetric::Parameters params;
48 params.norm = DistanceMetric::NormaliseDistanceToSum;
49 DistanceMetric dm(params);
46 vector<double> 50 vector<double>
47 e1 = getTestFeature(1), 51 e1 = getTestFeature(1),
48 e2 = getTestFeature(2), 52 e2 = getTestFeature(2),
49 e0 = getTestFeature(0); 53 e0 = getTestFeature(0);
50 54