merging dev stuff

src/seriesClassification.cpp

@@ -17,7 +17,7 @@
 #define SEARCH_RADIUS 1
 
 template<typename T>
-seriesClassificationTemplate<T>::seriesClassificationTemplate() {};
+seriesClassificationTemplate<T>::seriesClassificationTemplate() : hopSize(1), counter(0) {};
 
 template<typename T>
 seriesClassificationTemplate<T>::~seriesClassificationTemplate() {};
@@ -54,6 +54,10 @@ bool seriesClassificationTemplate<T>::train(const std::vector<trainingSeriesTemp
             lengthsPerLabel[allTrainingSeries[i].label] = tempLengths;
         }
     }
+    //TODO: make this size smarter?
+    for (int i = 0; i < maxLength; ++i ) {
+        seriesBuffer.push_back({0}); //set size of continuous buffer
+    }
     return trained;
 };
 
@@ -104,6 +108,19 @@ T seriesClassificationTemplate<T>::run(const std::vector<std::vector<T>> &inputS
     return lowestCost;
 };
 
+template<typename T>
+std::string seriesClassificationTemplate<T>::runContinuous(const std::vector<T> &inputVector) {
+    seriesBuffer.erase(seriesBuffer.begin());
+    seriesBuffer.push_back(inputVector);
+    std::string returnString = "none";
+    if ((counter % hopSize) == 0 ) {
+        returnString =
+        counter = 0;
+    }
+    ++counter;
+    return returnString;
+}
+
 template<typename T>
 std::vector<T> seriesClassificationTemplate<T>::getCosts() const{
     return allCosts;
@@ -198,4 +215,4 @@ template class seriesClassificationTemplate<float>;
 //std::vector<T> seriesClassification::getCosts(const std::vector<trainingExample> &trainingSet) {
 //    run(trainingSet);
 //    return allCosts;
-//}
\ No newline at end of file
+//}

src/seriesClassification.h

@@ -50,6 +50,12 @@ public:
      */
     T run(const std::vector<std::vector<T> > &inputSeries, std::string label);
     
+    /** Compare an input series to all of the stored series with a specified label
+     * @param std::vector<T> one frame either float or double input data
+     * @return The lowest cost match, float or double
+     */
+    std::string runContinuous(const std::vector<T> &inputVector);
+    
     /** Get the costs that were calculated by the run method
      * @return A vector of floats or doubles, the cost of matching to each training series
      */
@@ -103,6 +109,10 @@ private:
     int maxLength;
     int minLength;
     std::map<std::string, minMax<int> > lengthsPerLabel;
+    
+    std::vector<std::vector<T> > seriesBuffer;
+    int hopSize;
+    int counter;
 };
 
 //This is here to keep the old API working