comparison src/FeatureConditioner.cpp @ 116:eed5f9594268 refactors

Add OutputDerivative, for completeness, & make DistanceMetric cope with negative feature values

     int size = feature.size();
     
     vector<double> out(size, 0.0);
 
     double totalEnergy = 0;
-    if (m_params.order == OutputRectifiedDerivative) {
+
+    switch (m_params.order) {
+
+    case OutputRectifiedDerivative:
         for (int i = 0; i < size; i++) {
             totalEnergy += feature[i];
             if (feature[i] > m_prev[i]) {
                 out[i] = feature[i] - m_prev[i];
             } else {
                 out[i] = 0;
             }
         }
-    } else {
+        break;
+
+    case OutputDerivative:
         for (int i = 0; i < size; i++) {
+            totalEnergy += feature[i];
+            out[i] = feature[i] - m_prev[i];
+        }
+        break;
+        
+    case OutputFeatures:
+        for (int i = 0; i < size; i++) {
+            totalEnergy += feature[i];
             out[i] = feature[i];
-            totalEnergy += out[i];
         }
+        break;
     }
 
     if (m_ltAverage == 0) {
 	m_ltAverage = totalEnergy;
     } else {