changeset 67:a3efb15e7faf refactors

Merge from branch refactors_no_float

--- a/src/Finder.cpp	Tue Nov 18 10:06:40 2014 +0000
+++ b/src/Finder.cpp	Tue Nov 18 10:33:03 2014 +0000
@@ -278,8 +278,13 @@
 int
 Finder::retrievePath(bool smooth, vector<int> &pathx, vector<int> &pathy)
 {
-    int x = pm2->getFrameCount() - 1;
-    int y = pm1->getFrameCount() - 1;
+    int ex = pm2->getFrameCount() - 1;
+    int ey = pm1->getFrameCount() - 1;
+    
+    int x = ex;
+    int y = ey;
+    
+//    cerr << "before: x = " << x << ", y = " << y << endl;
 
     if (duration2 > 0 && duration2 < pm2->getFrameCount()) {
         x = duration2 - 1;
@@ -288,11 +293,23 @@
         y = duration1 - 1;
     }
 
+    if (!find(y, x)) {
+        // Path did not pass through the expected end point --
+        // probably means the pieces are substantially different in
+        // the later bits. Reset the expected end point to the end of
+        // both files including any trailing silence.
+        cerr << "NOTE: Path did not pass through expected end point, inputs are probably significantly different" << endl;
+        x = ex;
+        y = ey;
+    }
+
     recalculatePathCostMatrix(0, 0, y, x);
 
     pathx.clear();
     pathy.clear();
 
+//    cerr << "start: x = " << x << ", y = " << y << endl;
+    
     while (find(y, x) && ((x > 0) || (y > 0))) {
 
 //        cerr << "x = " << x << ", y = " << y;