comparison MonoNote.cpp @ 150:729cc1da9b8d memory

Use fixed-lag HMM in note tracking as well (when fixed-lag mode is selected)

 #include <complex>
 
 using std::vector;
 using std::pair;
 
-MonoNote::MonoNote() :
-    hmm(0)
+MonoNote::MonoNote(bool fixedLag) :
+    m_fixedLag(fixedLag),
+    hmm(m_fixedLag ? 1000 : 0)
 {
 }
 
 MonoNote::~MonoNote()
 {

     // Since the matrix is very sparse, we can avoid some of this by
     // feeding the (sparse implementation of) HMM one column at a
     // time.
 
     vector<int> path;
+    path.reserve(pitchProb.size());
     
     if (!pitchProb.empty()) {
 
         hmm.initialise(hmm.calculateObsProb(pitchProb[0]));
         
         for (size_t iFrame = 1; iFrame < pitchProb.size(); ++iFrame)
         {
+            if (m_fixedLag && (int(iFrame) >= hmm.m_fixedLag)) 
+            {
+                vector<int> rawPath = hmm.track();
+                path.push_back(rawPath[0]);
+            }
+
             hmm.process(hmm.calculateObsProb(pitchProb[iFrame]));
         }
 
-        path = hmm.track();
+        vector<int> rawPath = hmm.track();
+        path.insert(path.end(), rawPath.begin(), rawPath.end());
     }
     
-    vector<MonoNote::FrameOutput> out; 
+    vector<MonoNote::FrameOutput> out;
+    out.reserve(path.size());
 
     for (size_t iFrame = 0; iFrame < path.size(); ++iFrame)
     {
         double currPitch = -1;
         int stateKind = 0;