comparison src/Matcher.cpp @ 96:6b91e40b2c04 refactors

Tidy

 
     m_otherMatcher->m_runCount = 0;
 }
 
 void
-Matcher::updateValue(int i, int j, Advance dir, double value, float dMN)
-{
-    float weighted = dMN;
+Matcher::updateValue(int i, int j, Advance dir, double value, float distance)
+{
+    float weighted = distance;
     if (dir == AdvanceBoth) {
         weighted *= m_params.diagonalWeight;
     }
     
     if (m_firstPM) {
 
-        m_distance[i][j - m_first[i]] = dMN;
+        setDistance(i, j, distance);
         setPathCost(i, j, dir, value + weighted);
 
     } else {
 
         if (dir == AdvanceThis) dir = AdvanceOther;

             m_otherMatcher->m_bestPathCost[j].resize(idx * 2, -1);
             m_otherMatcher->m_distance[j].resize(idx * 2, -1);
             m_otherMatcher->m_advance[j].resize(idx * 2, AdvanceNone);
         }
 
-        m_otherMatcher->m_distance[j][idx] = dMN;
+        m_otherMatcher->setDistance(j, i, distance);
         m_otherMatcher->setPathCost(j, i, dir, value + weighted);
     }
 }
 
 Matcher::Advance