comparison src/Matcher.cpp @ 83:10e76188c846 refactors

Expose diagonal weight as a parameter

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

             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->setPathCost(j, i, dir, value + (dir == AdvanceBoth ? dMN*2: dMN));
+        m_otherMatcher->setPathCost(j, i, dir, value + weighted);
     }
 }
 
 Matcher::Advance
 Matcher::getAdvance(int i, int j)