comparison src/Matcher.cpp @ 181:8e7f96432570 types

Introduce (though don't use properly) types header; get to build

         return m_otherMatcher->getPathCost(j, i);
     }
 }
                 
 void
-Matcher::setPathCost(int i, int j, Advance dir, double pathCost)
+Matcher::setPathCost(int i, int j, advance_t dir, double pathCost)
 {
     if (m_firstPM) {
         if (!isInRange(i, j)) {
             cerr << "ERROR: Matcher::setPathCost(" << i << ", " << j << ", "
                  << dir << ", " << pathCost

 Matcher::size()
 {
     int distSize = (m_params.maxRunCount + 1) * m_blockSize;
     m_bestPathCost.resize(m_distXSize, vector<double>(distSize, -1));
     m_distance.resize(m_distXSize, vector<float>(distSize, -1));
-    m_advance.resize(m_distXSize, vector<Advance>(distSize, AdvanceNone));
+    m_advance.resize(m_distXSize, vector<advance_t>(distSize, AdvanceNone));
     m_first.resize(m_distXSize, 0);
     m_last.resize(m_distXSize, 0);
 }
 
 void

         vector<float> dNew(len, -1.f);
 
         vector<double> bpcOld = m_bestPathCost[m_frameCount - m_blockSize];
         vector<double> bpcNew(len, -1.0);
 
-        vector<Advance> adOld = m_advance[m_frameCount - m_blockSize];
-        vector<Advance> adNew(len, AdvanceNone);
+        vector<advance_t> adOld = m_advance[m_frameCount - m_blockSize];
+        vector<advance_t> adNew(len, AdvanceNone);
 
         for (int i = 0; i < len; ++i) {
             dNew[i] = dOld[i];
             bpcNew[i] = bpcOld[i];
             adNew[i] = adOld[i];

 
     m_otherMatcher->m_runCount = 0;
 }
 
 void
-Matcher::updateValue(int i, int j, Advance dir, double value, float distance)
+Matcher::updateValue(int i, int j, advance_t dir, double value, float distance)
 {
     float weighted = distance;
     if (dir == AdvanceBoth) {
         weighted *= m_params.diagonalWeight;
     }

         m_otherMatcher->setDistance(j, i, distance);
         m_otherMatcher->setPathCost(j, i, dir, value + weighted);
     }
 }
 
-Matcher::Advance
+advance_t
 Matcher::getAdvance(int i, int j)
 {
     if (m_firstPM) {
         if (!isInRange(i, j)) {
             cerr << "ERROR: Matcher::getAdvance(" << i << ", " << j << "): "