Mercurial > hg > match-vamp
comparison test/TestDistanceMetric.cpp @ 185:a17b22abd551 re-minimise
Code now builds, DistanceMetric tests fail
author | Chris Cannam |
---|---|
date | Thu, 26 Feb 2015 10:28:23 +0000 |
parents | 214b72d55796 |
children | af6120a32063 |
comparison
equal
deleted
inserted
replaced
184:6c12db195986 | 185:a17b22abd551 |
---|---|
10 #define BOOST_TEST_DYN_LINK | 10 #define BOOST_TEST_DYN_LINK |
11 #define BOOST_TEST_MAIN | 11 #define BOOST_TEST_MAIN |
12 | 12 |
13 #include <boost/test/unit_test.hpp> | 13 #include <boost/test/unit_test.hpp> |
14 | 14 |
15 static vector<double> getTestFeature(double m) | 15 static feature_t getTestFeature(double m) |
16 { | 16 { |
17 vector<double> f; | 17 feature_t f; |
18 double fd[] = { 0, 1, 2, 3 }; | 18 int fd[] = { 0, 1, 2, 3 }; |
19 for (int i = 0; i < 4; ++i) { | 19 for (int i = 0; i < 4; ++i) { |
20 f.push_back(fd[i] * m); | 20 f.push_back(featurebin_t(fd[i] * m)); |
21 } | 21 } |
22 return f; | 22 return f; |
23 } | 23 } |
24 | 24 |
25 BOOST_AUTO_TEST_SUITE(TestDistanceMetric) | 25 BOOST_AUTO_TEST_SUITE(TestDistanceMetric) |
27 BOOST_AUTO_TEST_CASE(nonorm) | 27 BOOST_AUTO_TEST_CASE(nonorm) |
28 { | 28 { |
29 DistanceMetric::Parameters params; | 29 DistanceMetric::Parameters params; |
30 params.norm = DistanceMetric::NoDistanceNormalisation; | 30 params.norm = DistanceMetric::NoDistanceNormalisation; |
31 DistanceMetric dm(params); | 31 DistanceMetric dm(params); |
32 vector<double> | 32 feature_t |
33 e1 = getTestFeature(1), | 33 e1 = getTestFeature(1), |
34 e2 = getTestFeature(2), | 34 e2 = getTestFeature(2), |
35 e0 = getTestFeature(0); | 35 e0 = getTestFeature(0); |
36 | 36 |
37 double noise = 1e-3 * 4; | 37 double noise = 1e-3 * 4; |
47 BOOST_AUTO_TEST_CASE(sum) | 47 BOOST_AUTO_TEST_CASE(sum) |
48 { | 48 { |
49 DistanceMetric::Parameters params; | 49 DistanceMetric::Parameters params; |
50 params.norm = DistanceMetric::NormaliseDistanceToSum; | 50 params.norm = DistanceMetric::NormaliseDistanceToSum; |
51 DistanceMetric dm(params); | 51 DistanceMetric dm(params); |
52 vector<double> | 52 feature_t |
53 e1 = getTestFeature(1), | 53 e1 = getTestFeature(1), |
54 e2 = getTestFeature(2), | 54 e2 = getTestFeature(2), |
55 e0 = getTestFeature(0); | 55 e0 = getTestFeature(0); |
56 | 56 |
57 double noise = 1e-3 * 4; | 57 double noise = 1e-3 * 4; |