Commit 8225d98b authored by Andrey Filippov's avatar Andrey Filippov

showing all maxes if >1

parent 6d4eee07
...@@ -5569,12 +5569,12 @@ public class Correlation2d { ...@@ -5569,12 +5569,12 @@ public class Correlation2d {
imgdtt_params.lmas_num_iter, // int num_iter, // 20 imgdtt_params.lmas_num_iter, // int num_iter, // 20
debug_level); // imgdtt_params.lma_debug_level1); // 4); // int debug_level) // > 3 debug_level); // imgdtt_params.lma_debug_level1); // 4); // int debug_level) // > 3
if (!lmaSuccess && (lma.getBadTile() >= 0)) { if (!lmaSuccess && (lma.getBadTile() >= 0)) {
if (debug_level > -2) { if (debug_level > 0) {
System.out.println("Found bad tile/pair during single (probably wrong initial maximum - try around preliminary? "+lma.getBadTile()); System.out.println("Found bad tile/pair during single (probably wrong initial maximum - try around preliminary? "+lma.getBadTile());
} }
} }
if (!lmaSuccess && (npass > 0) && en_shape) { // only if not already filtered if (!lmaSuccess && (npass > 0) && en_shape) { // only if not already filtered
if (debug_level > -3) { if (debug_level > 0) {
System.out.println("LMA failed on pass2. Disabling some adjustments and re-trying."); System.out.println("LMA failed on pass2. Disabling some adjustments and re-trying.");
} }
lma.restoreSolution(); lma.restoreSolution();
...@@ -5598,7 +5598,7 @@ public class Correlation2d { ...@@ -5598,7 +5598,7 @@ public class Correlation2d {
imgdtt_params.lmas_num_iter, // int num_iter, // 20 imgdtt_params.lmas_num_iter, // int num_iter, // 20
debug_level); // imgdtt_params.lma_debug_level1); // 4); // int debug_level) // > 3 debug_level); // imgdtt_params.lma_debug_level1); // 4); // int debug_level) // > 3
if (!lmaSuccess) { if (!lmaSuccess) {
if (debug_level > -3) { if (debug_level > 0) {
System.out.println("Still did not help - LMA failed."); System.out.println("Still did not help - LMA failed.");
} }
} }
......
...@@ -3521,10 +3521,16 @@ public class ImageDtt extends ImageDttCPU { ...@@ -3521,10 +3521,16 @@ public class ImageDtt extends ImageDttCPU {
imgdtt_params.lma_relax_indiv_max// double lma_relax_indiv_max // double relax_indiv_max imgdtt_params.lma_relax_indiv_max// double lma_relax_indiv_max // double relax_indiv_max
); );
if (debug_print_targets) { if (debug_print_targets) {
String dbg_s = " image_dtt "+tileX+":"+tileY+" ("+(tileX+tilesX*tileY)+")"; String dbg_s = "";
for (int nmax = 0; nmax < dispStrs.length; nmax++) {
if (nmax > 0) {
dbg_s+="\n";
}
dbg_s += " image_dtt "+tileX+":"+tileY+" ("+(tileX+tilesX*tileY)+") <"+nmax+"> ";
for (int i = 0; i < dispStrs[0][0].length; i++) { for (int i = 0; i < dispStrs[0][0].length; i++) {
dbg_s+=" "+dispStrs[0][0][i]; dbg_s+=" "+dispStrs[0][0][i];
} }
}
System.out.println(dbg_s); System.out.println(dbg_s);
} }
disp_str_lma = new double [dispStrs.length][]; // order matching input ones disp_str_lma = new double [dispStrs.length][]; // order matching input ones
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment