comparison src/Silvet.cpp @ 34:7d81407a2fd8

Start on EM class

   License, or (at your option) any later version.  See the file
   COPYING included with this distribution for more information.
 */
 
 #include "Silvet.h"
-
-#include "data/include/templates.h"
+#include "EM.h"
 
 #include "maths/MedianFilter.h"
 #include "dsp/rateconversion/Resampler.h"
 
 #include "constant-q-cpp/cpp-qm-dsp/CQInterpolated.h"

     if (m_resampler) {
 	data = m_resampler->process(data.data(), data.size());
     }
 
     Grid cqout = m_cq->process(data);
+    return transcribe(cqout);
+}
+
+Silvet::FeatureSet
+Silvet::getRemainingFeatures()
+{
+    Grid cqout = m_cq->getRemainingBlocks();
+    return transcribe(cqout);
+}
+
+Silvet::FeatureSet
+Silvet::transcribe(const Grid &cqout)
+{
     Grid filtered = preProcess(cqout);
 
     FeatureSet fs;
 
     for (int i = 0; i < (int)filtered.size(); ++i) {

             f.values.push_back(float(filtered[i][j]));
         }
         fs[m_cqOutputNo].push_back(f);
     }
 
+    int width = filtered.size();
+
+    int iterations = 12;
+
+    for (int i = 0; i < width; ++i) {
+        EM em;
+        for (int j = 0; j < iterations; ++j) {
+            em.iterate(filtered[i]);
+        }
+        //!!! now do something with the results from em!
+    }
+
     return fs;
-}
-
-Silvet::FeatureSet
-Silvet::getRemainingFeatures()
-{
-
-    return FeatureSet();
 }
 
 Silvet::Grid
 Silvet::preProcess(const Grid &in)
 {

 
             for (int j = 0; j < processingHeight; ++j) {
 
                 int ix = inCol.size() - j - 55;
 
-                //!!! note these filters introduce more latency
-
                 double val = inCol[ix];
                 m_filterA[j]->push(val);
 
                 double a = m_filterA[j]->get();
                 m_filterB[j]->push(std::min(a, val));