Mercurial > hg > match-vamp
comparison src/Finder.cpp @ 95:bc3b60d65a5f refactors
More debug output
author | Chris Cannam |
---|---|
date | Thu, 27 Nov 2014 16:05:24 +0000 |
parents | c665173b3a33 |
children | 6b91e40b2c04 |
comparison
equal
deleted
inserted
replaced
94:13be4158251d | 95:bc3b60d65a5f |
---|---|
175 | 175 |
176 float newCost = m_m->getDistance(r, c); | 176 float newCost = m_m->getDistance(r, c); |
177 double updateTo = -1.0; | 177 double updateTo = -1.0; |
178 Matcher::Advance dir = Matcher::AdvanceNone; | 178 Matcher::Advance dir = Matcher::AdvanceNone; |
179 | 179 |
180 if (r > r1) { // not first row | 180 if (r > r1) { // not first row |
181 double min = -1; | 181 double min = -1; |
182 if ((c > prevRowStart) && (c <= prevRowStop)) { | 182 if ((c > prevRowStart) && (c <= prevRowStop)) { |
183 // diagonal from (r-1,c-1) | 183 // diagonal from (r-1,c-1) |
184 min = m_m->getPathCost(r-1, c-1) + newCost * diagonalWeight; | 184 min = m_m->getPathCost(r-1, c-1) + newCost * diagonalWeight; |
185 err.prevCost = m_m->getPathCost(r-1, c-1); | 185 err.prevCost = m_m->getPathCost(r-1, c-1); |
290 << err.costShouldBe << ", matrix contains " << err.costWas | 290 << err.costShouldBe << ", matrix contains " << err.costWas |
291 << endl; | 291 << endl; |
292 cerr << "Note: diagonal weight = " << m_m->getDiagonalWeight() << endl; | 292 cerr << "Note: diagonal weight = " << m_m->getDiagonalWeight() << endl; |
293 cerr << endl; | 293 cerr << endl; |
294 | 294 |
295 int w(10); | 295 int w(4); |
296 int ww(15); | |
296 | 297 |
297 cerr << "Distance matrix leading up to this point:" << endl; | 298 cerr << "Distance matrix leading up to this point:" << endl; |
298 cerr << setw(w) << ""; | 299 cerr << setprecision(12) << setw(w) << ""; |
299 for (int i = -4; i <= 0; ++i) { | 300 for (int i = -4; i <= 0; ++i) { |
300 cerr << setw(w) << i; | 301 cerr << setw(ww) << i; |
301 } | 302 } |
302 cerr << endl; | 303 cerr << endl; |
303 for (int j = -4; j <= 0; ++j) { | 304 for (int j = -4; j <= 0; ++j) { |
304 cerr << setw(w) << j; | 305 cerr << setw(w) << j; |
305 for (int i = -4; i <= 0; ++i) { | 306 for (int i = -4; i <= 0; ++i) { |
306 cerr << setw(w) << m_m->getDistance(err.r + j, err.c + i); | 307 cerr << setw(ww) << m_m->getDistance(err.r + j, err.c + i); |
307 } | 308 } |
308 cerr << endl; | 309 cerr << endl; |
309 } | 310 } |
310 cerr << endl; | 311 cerr << endl; |
311 | 312 |
312 cerr << "Cost matrix leading up to this point:" << endl; | 313 cerr << "Cost matrix leading up to this point:" << endl; |
313 cerr << setw(w) << ""; | 314 cerr << setw(w) << ""; |
314 for (int i = -4; i <= 0; ++i) { | 315 for (int i = -4; i <= 0; ++i) { |
315 cerr << setw(w) << i; | 316 cerr << setw(ww) << i; |
316 } | 317 } |
317 cerr << endl; | 318 cerr << endl; |
318 for (int j = -4; j <= 0; ++j) { | 319 for (int j = -4; j <= 0; ++j) { |
319 cerr << setw(w) << j; | 320 cerr << setw(w) << j; |
320 for (int i = -4; i <= 0; ++i) { | 321 for (int i = -4; i <= 0; ++i) { |
321 cerr << setw(w) << m_m->getPathCost(err.r + j, err.c + i); | 322 cerr << setw(ww) << m_m->getPathCost(err.r + j, err.c + i); |
322 } | 323 } |
323 cerr << endl; | 324 cerr << endl; |
324 } | 325 } |
325 cerr << endl; | 326 cerr << endl; |
326 } | 327 } |