comparison src/Matcher.cpp @ 89:7785bb8a1be6 refactors

Fix diagonal handling: there was an implicit fixed diagonal weight of 2 in comparison of diagmin+distance to othermin directly

 
         float distance = (float) m_metric.calcDistance
             (m_frames[frameIndex],
              m_otherMatcher->m_frames[index % m_blockSize]);
 
+        float diagDistance = distance * m_params.diagonalWeight;
+
         if ((m_frameCount == 0) && (index == 0)) { // first element
 
             updateValue(0, 0, AdvanceNone,
                         0,
                         distance);

                             min2, distance);
                 
             } else {
 
                 double min1 = getPathCost(m_frameCount - 1, index - 1);
-                if (min1 + distance <= min2) {
+                if (min1 + diagDistance <= min2 + distance) {
                     updateValue(m_frameCount, index, AdvanceBoth,
                                 min1, distance);
                 } else {
                     updateValue(m_frameCount, index, AdvanceThis,
                                 min2, distance);

                 cerr << "i = "<< m_frameCount << ", j = " << index << ", "
                      << " min1 = " << min1 << ", " 
                      << " min2 = " << min2 << ", " 
                      << " min3 = " << min3 << endl;
             }
+
+            double cost1 = min1 + distance;
+            double cost2 = min2 + distance;
+            double cost3 = min3 + diagDistance;
             
-            if (min1 <= min2) {
-                if (min3 + distance <= min1) {
+            if (cost1 <= cost2) {
+                if (cost3 <= cost1) {
                     updateValue(m_frameCount, index, AdvanceBoth,
                                 min3, distance);
                 } else {
                     updateValue(m_frameCount, index, AdvanceOther,
                                 min1, distance);
                 }
             } else {
-                if (min3 + distance <= min2) {
+                if (cost3 <= cost2) {
                     updateValue(m_frameCount, index, AdvanceBoth,
                                 min3, distance);
                 } else {
                     updateValue(m_frameCount, index, AdvanceThis,
                                 min2, distance);