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

Code now builds, DistanceMetric tests fail
author Chris Cannam
date Thu, 26 Feb 2015 10:28:23 +0000
parents 246de093f0f1
children ba0d2104abec
line wrap: on
line diff
--- a/src/FeatureConditioner.h	Thu Feb 26 09:55:28 2015 +0000
+++ b/src/FeatureConditioner.h	Thu Feb 26 10:28:23 2015 +0000
@@ -16,7 +16,7 @@
 #ifndef FEATURE_CONDITIONER_H
 #define FEATURE_CONDITIONER_H
 
-#include <vector>
+#include "Types.h"
 
 /**
  * Take a series of feature vectors and apply conditioning of some
@@ -96,7 +96,7 @@
     /**
      * Process the given feature and return the conditioned feature.
      */
-    std::vector<double> process(const std::vector<double> &feature);
+    feature_t process(const feature_t &feature);
 
 protected:
     Parameters m_params;
@@ -106,7 +106,7 @@
 
     /** The most recent feature, used for calculating the feature to
      *  feature difference. This is therefore not yet normalised. */
-    std::vector<double> m_prev;
+    feature_t m_prev;
 };
 
 #endif