changeset 95:bc3b60d65a5f refactors

More debug output
author Chris Cannam
date Thu, 27 Nov 2014 16:05:24 +0000
parents 13be4158251d
children 6b91e40b2c04
files src/Finder.cpp
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/Finder.cpp	Thu Nov 27 16:05:19 2014 +0000
+++ b/src/Finder.cpp	Thu Nov 27 16:05:24 2014 +0000
@@ -177,7 +177,7 @@
             double updateTo = -1.0;
             Matcher::Advance dir = Matcher::AdvanceNone;
 
-            if (r > r1) {	// not first row
+            if (r > r1) { // not first row
                 double min = -1;
                 if ((c > prevRowStart) && (c <= prevRowStop)) {
                     // diagonal from (r-1,c-1)
@@ -292,18 +292,19 @@
         cerr << "Note: diagonal weight = " << m_m->getDiagonalWeight() << endl;
         cerr << endl;
 
-        int w(10);
+        int w(4);
+        int ww(15);
 
         cerr << "Distance matrix leading up to this point:" << endl;
-        cerr << setw(w) << "";
+        cerr << setprecision(12) << setw(w) << "";
         for (int i = -4; i <= 0; ++i) {
-            cerr << setw(w) << i;
+            cerr << setw(ww) << i;
         }
         cerr << endl;
         for (int j = -4; j <= 0; ++j) {
             cerr << setw(w) << j;
             for (int i = -4; i <= 0; ++i) {
-                cerr << setw(w) << m_m->getDistance(err.r + j, err.c + i);
+                cerr << setw(ww) << m_m->getDistance(err.r + j, err.c + i);
             }
             cerr << endl;
         }
@@ -312,13 +313,13 @@
         cerr << "Cost matrix leading up to this point:" << endl;
         cerr << setw(w) << "";
         for (int i = -4; i <= 0; ++i) {
-            cerr << setw(w) << i;
+            cerr << setw(ww) << i;
         }
         cerr << endl;
         for (int j = -4; j <= 0; ++j) {
             cerr << setw(w) << j;
             for (int i = -4; i <= 0; ++i) {
-                cerr << setw(w) << m_m->getPathCost(err.r + j, err.c + i);
+                cerr << setw(ww) << m_m->getPathCost(err.r + j, err.c + i);
             }
             cerr << endl;
         }