Mercurial > hg > match-vamp

changeset 146:214b72d55796 noise

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update unit tests
author Chris Cannam
date Fri, 16 Jan 2015 16:48:55 +0000
parents ecfb4ada171b
children 3673e2dae6a7 b990fa45cb1f
files test/TestDistanceMetric.cpp
diffstat 1 files changed, 13 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/test/TestDistanceMetric.cpp	Fri Jan 16 16:43:56 2015 +0000
+++ b/test/TestDistanceMetric.cpp	Fri Jan 16 16:48:55 2015 +0000
@@ -34,12 +34,14 @@
 	e2 = getTestFeature(2),
 	e0 = getTestFeature(0);
 
-    BOOST_CHECK_EQUAL(dm.calcDistance(e0, e0), 0.0);
-    BOOST_CHECK_EQUAL(dm.calcDistance(e1, e0), 6.0);
-    BOOST_CHECK_EQUAL(dm.calcDistance(e0, e1), 6.0);
-    BOOST_CHECK_EQUAL(dm.calcDistance(e1, e1), 0.0);
-    BOOST_CHECK_EQUAL(dm.calcDistance(e1, e2), 6.0);
-    BOOST_CHECK_EQUAL(dm.calcDistance(e0, e2), 12.0);
+    double noise = 1e-3 * 4;
+    
+    BOOST_CHECK_EQUAL(dm.calcDistance(e0, e0), 0.0 + noise);
+    BOOST_CHECK_EQUAL(dm.calcDistance(e1, e0), 6.0 + noise);
+    BOOST_CHECK_EQUAL(dm.calcDistance(e0, e1), 6.0 + noise);
+    BOOST_CHECK_EQUAL(dm.calcDistance(e1, e1), 0.0 + noise);
+    BOOST_CHECK_EQUAL(dm.calcDistance(e1, e2), 6.0 + noise);
+    BOOST_CHECK_EQUAL(dm.calcDistance(e0, e2), 12.0 + noise);
 }
 
 BOOST_AUTO_TEST_CASE(sum)
@@ -52,11 +54,13 @@
 	e2 = getTestFeature(2),
 	e0 = getTestFeature(0);
 
-    BOOST_CHECK_EQUAL(dm.calcDistance(e0, e0), 0.0);
+    double noise = 1e-3 * 4;
+    
+    BOOST_CHECK_EQUAL(dm.calcDistance(e0, e0), 1.0);
     BOOST_CHECK_EQUAL(dm.calcDistance(e1, e0), 1.0);
     BOOST_CHECK_EQUAL(dm.calcDistance(e0, e1), 1.0);
-    BOOST_CHECK_EQUAL(dm.calcDistance(e1, e1), 0.0);
-    BOOST_CHECK_EQUAL(dm.calcDistance(e1, e2), 1.0/3.0);
+    BOOST_CHECK_EQUAL(dm.calcDistance(e1, e1), noise / (12.0 + noise));
+    BOOST_CHECK_EQUAL(dm.calcDistance(e1, e2), (6.0 + noise) / (18.0 + noise));
     BOOST_CHECK_EQUAL(dm.calcDistance(e0, e2), 1.0);
 }