Mercurial > hg > match-vamp

comparison test/TestDistanceMetric.cpp @ 197:547bea29ad89 re-minimise

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Increase noise for compact types
author Chris Cannam
date Fri, 27 Feb 2015 09:07:54 +0000
parents cee78423d235
children 827176d3b6ec
comparison
equal deleted inserted replaced
196:fa005e5e0953 197:547bea29ad89
66 e1 = getTestFeature(1), 66 e1 = getTestFeature(1),
67 e2 = getTestFeature(2), 67 e2 = getTestFeature(2),
68 e0 = getTestFeature(0); 68 e0 = getTestFeature(0);
69 69
70 double noise = 1e-3 * 4; 70 double noise = 1e-3 * 4;
71 #ifdef USE_COMPACT_TYPES
72 noise = 1.0 / params.scale;
73 #endif
71 74
72 BOOST_CHECK_EQUAL(dm.calcDistance(e0, e0), dm.scaleValueIntoDistanceRange(0.0 + noise)); 75 BOOST_CHECK_EQUAL(dm.calcDistance(e0, e0), dm.scaleValueIntoDistanceRange(0.0 + noise));
73 BOOST_CHECK_EQUAL(dm.calcDistance(e1, e0), dm.scaleValueIntoDistanceRange(6.0 + noise)); 76 BOOST_CHECK_EQUAL(dm.calcDistance(e1, e0), dm.scaleValueIntoDistanceRange(6.0 + noise));
74 BOOST_CHECK_EQUAL(dm.calcDistance(e0, e1), dm.scaleValueIntoDistanceRange(6.0 + noise)); 77 BOOST_CHECK_EQUAL(dm.calcDistance(e0, e1), dm.scaleValueIntoDistanceRange(6.0 + noise));
75 BOOST_CHECK_EQUAL(dm.calcDistance(e1, e1), dm.scaleValueIntoDistanceRange(0.0 + noise)); 78 BOOST_CHECK_EQUAL(dm.calcDistance(e1, e1), dm.scaleValueIntoDistanceRange(0.0 + noise));
86 e1 = getTestFeature(1), 89 e1 = getTestFeature(1),
87 e2 = getTestFeature(2), 90 e2 = getTestFeature(2),
88 e0 = getTestFeature(0); 91 e0 = getTestFeature(0);
89 92
90 double noise = 1e-3 * 4; 93 double noise = 1e-3 * 4;
94 #ifdef USE_COMPACT_TYPES
95 noise = 1.0 / params.scale;
96 #endif
91 97
92 BOOST_CHECK_EQUAL(dm.calcDistance(e0, e0), dm.scaleValueIntoDistanceRange(1.0)); 98 BOOST_CHECK_EQUAL(dm.calcDistance(e0, e0), dm.scaleValueIntoDistanceRange(1.0));
93 BOOST_CHECK_EQUAL(dm.calcDistance(e1, e0), dm.scaleValueIntoDistanceRange(1.0)); 99 BOOST_CHECK_EQUAL(dm.calcDistance(e1, e0), dm.scaleValueIntoDistanceRange(1.0));
94 BOOST_CHECK_EQUAL(dm.calcDistance(e0, e1), dm.scaleValueIntoDistanceRange(1.0)); 100 BOOST_CHECK_EQUAL(dm.calcDistance(e0, e1), dm.scaleValueIntoDistanceRange(1.0));
95 BOOST_CHECK_EQUAL(dm.calcDistance(e1, e1), dm.scaleValueIntoDistanceRange(noise / (12.0 + noise))); 101 BOOST_CHECK_EQUAL(dm.calcDistance(e1, e1), dm.scaleValueIntoDistanceRange(noise / (12.0 + noise)));