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

Code now builds, DistanceMetric tests fail

          << ", silenceThreshold = " << parameters.silenceThreshold
          << ", decay = " << parameters.decay << endl;
 #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);
     }
     if (m_prev.size() != feature.size()) {

 	return feature;
     }
 
     int size = static_cast<int>(feature.size());
     
-    vector<double> out(size, 0.0);
+    feature_t out(size, 0.0);
 
     double totalEnergy = 0;
 
     switch (m_params.order) {
 

         for (int i = 0; i < size; i++) {
             out[i] = 0;
 	}
     } 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);
 	}
     }
 
     m_prev = feature;
     return out;