# HG changeset patch # User Chris Cannam # Date 1421426935 0 # Node ID 214b72d557962f1c87a1b29faccde664a71888d7 # Parent ecfb4ada171ba27ef61f1d0b0ef483d7d637798e Update unit tests diff -r ecfb4ada171b -r 214b72d55796 test/TestDistanceMetric.cpp --- 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); }