comparison test/TestFeatureExtractor.cpp @ 185:a17b22abd551 re-minimise

Code now builds, DistanceMetric tests fail

     return outbin;
 }
 
 BOOST_AUTO_TEST_SUITE(TestFeatureExtractor)
 
-void checkAlternateProcessType(FeatureExtractor &fe, vector<double> expected,
+void checkAlternateProcessType(FeatureExtractor &fe, feature_t expected,
 			       vector<double> real, vector<double> imag)
 {
     vector<float> in;
     for (int i = 0; i < (int)real.size(); ++i) {
 	in.push_back(float(real[i]));
 	in.push_back(float(imag[i]));
     }
-    vector<double> alt = fe.process(&in[0]);
+    feature_t alt = fe.process(&in[0]);
     BOOST_CHECK_EQUAL_COLLECTIONS(alt.begin(), alt.end(),
 				  expected.begin(), expected.end());
 }
 
 BOOST_AUTO_TEST_CASE(chroma)

 		// use two input sweeps, so we can test that they are
 		// properly summed into the output bin
 		real[hs-bin-1] += 5.0;
 		imag[hs-bin-1] += 5.0;
 	
-		vector<double> out = fe.process(real, imag);
+		feature_t out = fe.process(real, imag);
 
 		checkAlternateProcessType(fe, out, real, imag);
 
 		// We expect to find all bins are 0 except for:
 		// 

 		// input bins less than the 17th are shepherded into
 		// the separate bin 0 (see docs in FeatureExtractor.h)
 
 		double cutoff = (17.0 * rate) / sz;
 		
-		vector<double> expected(fsz);
+		feature_t expected(fsz);
 
 		double infreq1 = (double(bin) * rate) / sz;
 
 		if (bin == hs-bin-1) {
 		    expected[freq2chroma(infreq1) + 1] += 450;

 	// use two input sweeps, so we can test that they are properly
 	// summed into the output bin
 	real[hs-bin-1] += 5.0;
 	imag[hs-bin-1] += 5.0;
 
-	vector<double> out = fe.process(real, imag);
+	feature_t out = fe.process(real, imag);
 
 	checkAlternateProcessType(fe, out, real, imag);
 
 	// We expect to find all bins are 0 except for:
 	// 

 	// So MIDI pitches up to and including 77 are mapped linearly
 	// by frequency into 34 bins; those from 78-126 inclusive are
 	// mapped linearly by MIDI pitch into the next 49 bins;
 	// everything above goes into the last bin, for 84 bins total.
 
-	vector<double> expected(fsz);
+	feature_t expected(fsz);
 
 	if (bin == hs-bin-1) {
 	    expected[bin2warped(bin, rate, sz)] += 450;
 	} else {
 	    expected[bin2warped(bin, rate, sz)] += 200;