diff src/FeatureConditioner.cpp @ 185:a17b22abd551 re-minimise

Code now builds, DistanceMetric tests fail

--- a/src/FeatureConditioner.cpp	Thu Feb 26 09:55:28 2015 +0000
+++ b/src/FeatureConditioner.cpp	Thu Feb 26 10:28:23 2015 +0000
@@ -34,8 +34,8 @@
 #endif
 }
 
-vector<double>
-FeatureConditioner::process(const vector<double> &feature)
+feature_t
+FeatureConditioner::process(const feature_t &feature)
 {
     if (m_prev.empty()) {
 	m_prev.resize(feature.size(), 0.0);
@@ -49,7 +49,7 @@
 
     int size = static_cast<int>(feature.size());
     
-    vector<double> out(size, 0.0);
+    feature_t out(size, 0.0);
 
     double totalEnergy = 0;
 
@@ -94,11 +94,11 @@
 	}
     } else if (m_params.norm == NormaliseToSum1) {
         for (int i = 0; i < size; i++) { 
-            out[i] /= totalEnergy;
+            out[i] = featurebin_t(out[i] / totalEnergy);
 	}
     } else if (m_params.norm == NormaliseToLTAverage) {
         for (int i = 0; i < size; i++) {
-            out[i] /= m_ltAverage;
+            out[i] = featurebin_t(out[i] / m_ltAverage);
 	}
     }