comparison src/Finder.cpp @ 135:42381e437fcd refactors

The finder is supposed to use normalised path-cost when calculation expand direction (as in Java implementation). Also, provide a way to query the forward path.

     pair<int, int> rowRange = m_m->getRowRange(col);
     if (rowRange.second > row+1) {
         rowRange.second = row+1;	// don't cheat by looking at future :)
     }
     for (int index = rowRange.first; index < rowRange.second; index++) {
-        double tmp = m_m->getPathCost(index, col);
+        double tmp = m_m->getNormalisedPathCost(index, col);
         if (tmp < min) {
             min = tmp;
             bestRow = index;
         }
     }

     pair<int, int> colRange = m_m->getColRange(row);
     if (colRange.second > col+1) {
         colRange.second = col+1;	// don't cheat by looking at future :)
     }
     for (int index = colRange.first; index < colRange.second; index++) {
-        double tmp = m_m->getPathCost(row, index);
+        double tmp = m_m->getNormalisedPathCost(row, index);
         if (tmp < min) {
             min = tmp;
             bestCol = index;
             bestRow = row;
         }
     }
 
+//    cerr << "at [" << row << "," << col << "] (cost " << m_m->getPathCost(row, col) << ") blocksize = " << m_m->getBlockSize() << " best is [" << bestRow << "," << bestCol << "] (cost " << min << ")" << endl;
+    
     if (bestRow == row) {
         if (bestCol == col) {
             return Matcher::AdvanceBoth;
         } else {
             return Matcher::AdvanceThis;