comparison MonoNoteHMM.cpp @ 133:83978b93aac1 fixedlag

ah, didn't commit when I stopped working... what did I do?

     
     size_t nCandidate = pitchProb.size();
     
     // what is the probability of pitched
     double pIsPitched = 0;
-    for (size_t iCandidate = 0; iCandidate < nCandidate; ++iCandidate)
-    {
-        // pIsPitched = pitchProb[iCandidate].second > pIsPitched ? pitchProb[iCandidate].second : pIsPitched;
-        pIsPitched += pitchProb[iCandidate].second;
-    }
-
-    // pIsPitched = std::pow(pIsPitched, (1-par.priorWeight)) * std::pow(par.priorPitchedProb, par.priorWeight);
-    pIsPitched = pIsPitched * (1-par.priorWeight) + par.priorPitchedProb * par.priorWeight;
+    for (size_t iCand = 0; iCand < nCandidate; ++iCand)
+    {
+        pIsPitched += pitchProb[iCand].second;
+    }
+
+    pIsPitched = pIsPitched * (1-par.priorWeight) + 
+                     par.priorPitchedProb * par.priorWeight;
 
     vector<double> out = vector<double>(par.n);
     double tempProbSum = 0;
     for (size_t i = 0; i < par.n; ++i)
     {

             if (nCandidate > 0)
             {
                 double minDist = 10000.0;
                 double minDistProb = 0;
                 size_t minDistCandidate = 0;
-                for (size_t iCandidate = 0; iCandidate < nCandidate; ++iCandidate)
+                for (size_t iCand = 0; iCand < nCandidate; ++iCand)
                 {
-                    double currDist = std::abs(getMidiPitch(i)-pitchProb[iCandidate].first);
+                    double currDist = std::abs(getMidiPitch(i)-
+                                               pitchProb[iCand].first);
                     if (currDist < minDist)
                     {
                         minDist = currDist;
-                        minDistProb = pitchProb[iCandidate].second;
-                        minDistCandidate = iCandidate;
+                        minDistProb = pitchProb[iCand].second;
+                        minDistCandidate = iCand;
                     }
                 }
                 tempProb = std::pow(minDistProb, par.yinTrust) * 
                            boost::math::pdf(pitchDistr[i], 
                                             pitchProb[minDistCandidate].first);

             int fromPitch = iPitch;
             int toPitch = jPitch;
             double semitoneDistance = 
                 std::abs(fromPitch - toPitch) * 1.0 / par.nPPS;
             
-            // if (std::fmod(semitoneDistance, 1) == 0 && semitoneDistance > par.minSemitoneDistance)
+
             if (semitoneDistance == 0 || 
                 (semitoneDistance > par.minSemitoneDistance 
                  && semitoneDistance < par.maxJump))
             {
                 size_t toIndex = jPitch * par.nSPP; // note attack index

                 m_to.push_back(toIndex);
             }
         }
         for (size_t i = 0; i < tempTransProbSilent.size(); ++i)
         {
-            m_transProb.push_back((1-par.pSilentSelftrans) * tempTransProbSilent[i]/probSumSilent);
+            m_transProb.push_back((1-par.pSilentSelftrans) * 
+                                  tempTransProbSilent[i]/probSumSilent);
         }
     }
     m_nTrans = m_transProb.size();
     m_delta = vector<double>(m_nState);
     m_oldDelta = vector<double>(m_nState);