Mercurial > hg > match-vamp

diff test/TestFeatureExtractor.cpp @ 188:487261a22b18 re-minimise

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
distance_t * diagonalWeight might not fit in distance_t; use pathcost_t for it. Also remove C-style casts.
author Chris Cannam
date Thu, 26 Feb 2015 12:19:17 +0000
parents a17b22abd551
children fa005e5e0953
line wrap: on
line diff
--- a/test/TestFeatureExtractor.cpp	Thu Feb 26 10:48:36 2015 +0000
+++ b/test/TestFeatureExtractor.cpp	Thu Feb 26 12:19:17 2015 +0000
@@ -39,7 +39,7 @@
 			       vector<double> real, vector<double> imag)
 {
     vector<float> in;
-    for (int i = 0; i < (int)real.size(); ++i) {
+    for (size_t i = 0; i < real.size(); ++i) {
 	in.push_back(float(real[i]));
 	in.push_back(float(imag[i]));
     }
@@ -64,7 +64,7 @@
 	    int hs = sz / 2 + 1;
 	    int fsz = 13;
     
-	    FeatureExtractor::Parameters params((float)rate, sz);
+	    FeatureExtractor::Parameters params(float(rate), sz);
 	    params.useChromaFrequencyMap = true;
 	    FeatureExtractor fe(params);
 	    BOOST_CHECK_EQUAL(fe.getFeatureSize(), fsz);
@@ -141,7 +141,7 @@
     int hs = sz / 2 + 1;
     int fsz = 84;
     
-    FeatureExtractor::Parameters params((float)rate, sz);
+    FeatureExtractor::Parameters params(float(rate), sz);
     FeatureExtractor fe(params);
     BOOST_CHECK_EQUAL(fe.getFeatureSize(), fsz);