Commit 61eb0d79 authored by Andrey Filippov's avatar Andrey Filippov

working, contains debug print

parent 8cdf263c
...@@ -74,9 +74,10 @@ public class CuasMotionLMA { ...@@ -74,9 +74,10 @@ public class CuasMotionLMA {
public static final int RSLT_QMATCH = 30; public static final int RSLT_QMATCH = 30;
public static final int RSLT_QCENTER = 31; public static final int RSLT_QCENTER = 31;
public static final int RSLT_QSCORE = 32; public static final int RSLT_QSCORE = 32;
public static final int RSLT_STRONGER =33; // index of stronger neighbor (may be more)
public static final int RSLT_WHEN = 33; public static final int RSLT_WHEN = 34;
public static final int RSLT_FAIL = 34; public static final int RSLT_FAIL = 35;
public static final int RSLT_LEN = RSLT_FAIL+1; public static final int RSLT_LEN = RSLT_FAIL+1;
...@@ -88,6 +89,7 @@ public class CuasMotionLMA { ...@@ -88,6 +89,7 @@ public class CuasMotionLMA {
"ERR-BEFORE", "ERR-AFTER", "BA-DIRS", // before dir + 16*after dir "ERR-BEFORE", "ERR-AFTER", "BA-DIRS", // before dir + 16*after dir
"*MOTION-SCORE", "*MOTION-SCORE",
"*Q-AMPL","*Q-RMSE","*Q-RMSE/A","*Q-MATCH","*Q-CENTER","*Q-SCORE", "*Q-AMPL","*Q-RMSE","*Q-RMSE/A","*Q-MATCH","*Q-CENTER","*Q-SCORE",
"Stronger",
"WHEN", "FAILURE"}; "WHEN", "FAILURE"};
public static final int FAIL_NONE = 0; public static final int FAIL_NONE = 0;
......
...@@ -168,7 +168,13 @@ public class TileNeibs{ ...@@ -168,7 +168,13 @@ public class TileNeibs{
if (indx < 0) return false; if (indx < 0) return false;
int y = indx / sizeX; int y = indx / sizeX;
int x = indx % sizeX; int x = indx % sizeX;
return (y >= roi.y) && (x >= roi.x) || (y < roi.y + roi.height) || (x < roi.x + roi.width); return (y >= roi.y) && (x >= roi.x) && (y < roi.y + roi.height) && (x < roi.x + roi.width);
}
public boolean isInside (int indx) {
if (indx < 0) return false;
int y = indx / sizeX;
int x = indx % sizeX;
return (y >= 0) && (x >= 0) && (y < sizeY) && (x < sizeX);
} }
/** /**
......
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