Commit 8cdf263c authored by Andrey Filippov's avatar Andrey Filippov

Debugging

parent fb528d3a
......@@ -783,8 +783,12 @@ min_str_neib_fpn 0.35
public boolean cuas_center_targ = true; // re-run target extraction with targets centered to their tiles
public boolean cuas_isolated = true; // remove targets that do not have neighbors before/after
public boolean cuas_remove_2seq = true; // Remove short target sequences consisting of 2 consecutive key frames
public int cuas_min_seq = 3; // minimal number of consecutive key frames for the same target
public int cuas_min_seq_fl = 2; // minimal number of consecutive key frames for the same target that includes first or last key frame
// public boolean cuas_remove_2seq = true; // Remove 2-long target sequences consisting of 2 consecutive key frames
// public boolean cuas_remove_2seq_all=true; // Remove 2-long first/last target sequences
public double cuas_max_mismatch = 2.0; // maximal position error between consecutive scene sequences
public double cuas_good_mismatch = 0.4; // maximal position error between consecutive scene sequences that adds to the score
public boolean cuas_fail_mismatch = false; // fail high mismatch early
public boolean cuas_ignore_mismatch = false; // calculate mismatch but do not remove
......@@ -2395,10 +2399,20 @@ min_str_neib_fpn 0.35
gd.addCheckbox ("Remove single-frame targets", this.cuas_isolated,
"Remove targets that do not have neighbors before/after.");
gd.addCheckbox ("Remove pairs too", this.cuas_remove_2seq,
"Remove short target sequences consisting of 2 consecutive key frames.");
gd.addNumericField("Remove by mismatch", this.cuas_max_mismatch, 5,8,"pix",
// gd.addCheckbox ("Remove pairs (but ends)", this.cuas_remove_2seq,
// "Remove short target sequences consisting of 2 consecutive key frames, except those including first/last sequence.");
// gd.addCheckbox ("Remove pairs everywhere", this.cuas_remove_2seq_all,
// "Remove short target sequences consisting of 2 consecutive key frames everywhere, including first/last keyframes.");
gd.addNumericField("Minimal sequence length", this.cuas_min_seq, 0,3,"key frames",
"Minimal number of consecutive key frames for the target to be detected.");
gd.addNumericField("Minimal end sequence length", this.cuas_min_seq_fl, 0,3,"key frames",
"Minimal number of consecutive key frames for the target to be detected if the sequence includes first or last key frame.");
gd.addNumericField("Maximal allowed mismatch", this.cuas_max_mismatch, 5,8,"pix",
"Maximal position error between consecutive scene sequences.");
gd.addNumericField("Good mismatch", this.cuas_good_mismatch, 5,8,"pix",
"Maximal position error between consecutive scene sequences to add to the score.");
gd.addCheckbox ("Fail mismatch early", this.cuas_fail_mismatch,
"Fail after score calculation if there is not match both before and after.");
gd.addCheckbox ("Ignore mismatch", this.cuas_ignore_mismatch,
......@@ -3512,8 +3526,14 @@ min_str_neib_fpn 0.35
this.cuas_center_targ = gd.getNextBoolean();
this.cuas_isolated = gd.getNextBoolean();
this.cuas_remove_2seq = gd.getNextBoolean();
// this.cuas_remove_2seq = gd.getNextBoolean();
// this.cuas_remove_2seq_all = gd.getNextBoolean();
this.cuas_min_seq= (int) gd.getNextNumber();
this.cuas_min_seq_fl= (int) gd.getNextNumber();
this.cuas_max_mismatch= gd.getNextNumber();
this.cuas_good_mismatch = gd.getNextNumber();
this.cuas_fail_mismatch = gd.getNextBoolean();
this.cuas_ignore_mismatch = gd.getNextBoolean();
......@@ -4513,8 +4533,16 @@ min_str_neib_fpn 0.35
properties.setProperty(prefix+"cuas_isolated", this.cuas_isolated+""); // boolean
properties.setProperty(prefix+"cuas_remove_2seq", this.cuas_remove_2seq+""); // boolean
// properties.setProperty(prefix+"cuas_remove_2seq", this.cuas_remove_2seq+""); // boolean
// properties.setProperty(prefix+"cuas_remove_2seq_all", this.cuas_remove_2seq_all+"");// boolean
properties.setProperty(prefix+"cuas_min_seq", this.cuas_min_seq+""); // int
properties.setProperty(prefix+"cuas_min_seq_fl", this.cuas_min_seq_fl+""); // int
properties.setProperty(prefix+"cuas_max_mismatch", this.cuas_max_mismatch+""); // double
properties.setProperty(prefix+"cuas_good_mismatch", this.cuas_good_mismatch+""); // double
properties.setProperty(prefix+"cuas_fail_mismatch", this.cuas_fail_mismatch+""); // boolean
properties.setProperty(prefix+"cuas_ignore_mismatch", this.cuas_ignore_mismatch+"");// boolean
properties.setProperty(prefix+"cuas_by_horizon", this.cuas_by_horizon+""); // boolean
......@@ -5483,8 +5511,12 @@ min_str_neib_fpn 0.35
if (properties.getProperty(prefix+"cuas_center_targ")!=null) this.cuas_center_targ=Boolean.parseBoolean(properties.getProperty(prefix+"cuas_center_targ"));
if (properties.getProperty(prefix+"cuas_isolated")!=null) this.cuas_isolated=Boolean.parseBoolean(properties.getProperty(prefix+"cuas_isolated"));
if (properties.getProperty(prefix+"cuas_remove_2seq")!=null) this.cuas_remove_2seq=Boolean.parseBoolean(properties.getProperty(prefix+"cuas_remove_2seq"));
// if (properties.getProperty(prefix+"cuas_remove_2seq")!=null) this.cuas_remove_2seq=Boolean.parseBoolean(properties.getProperty(prefix+"cuas_remove_2seq"));
// if (properties.getProperty(prefix+"cuas_remove_2seq_all")!=null) this.cuas_remove_2seq_all=Boolean.parseBoolean(properties.getProperty(prefix+"cuas_remove_2seq_all"));
if (properties.getProperty(prefix+"cuas_min_seq")!=null) this.cuas_min_seq=Integer.parseInt(properties.getProperty(prefix+"cuas_min_seq"));
if (properties.getProperty(prefix+"cuas_min_seq_fl")!=null) this.cuas_min_seq_fl=Integer.parseInt(properties.getProperty(prefix+"cuas_min_seq_fl"));
if (properties.getProperty(prefix+"cuas_max_mismatch")!=null) this.cuas_max_mismatch=Double.parseDouble(properties.getProperty(prefix+"cuas_max_mismatch"));
if (properties.getProperty(prefix+"cuas_good_mismatch")!=null) this.cuas_good_mismatch=Double.parseDouble(properties.getProperty(prefix+"cuas_good_mismatch"));
if (properties.getProperty(prefix+"cuas_fail_mismatch")!=null) this.cuas_fail_mismatch=Boolean.parseBoolean(properties.getProperty(prefix+"cuas_fail_mismatch"));
if (properties.getProperty(prefix+"cuas_ignore_mismatch")!=null) this.cuas_ignore_mismatch=Boolean.parseBoolean(properties.getProperty(prefix+"cuas_ignore_mismatch"));
......@@ -6452,8 +6484,14 @@ min_str_neib_fpn 0.35
imp.cuas_center_targ = this.cuas_center_targ;
imp.cuas_isolated = this.cuas_isolated;
imp.cuas_remove_2seq = this.cuas_remove_2seq;
// imp.cuas_remove_2seq = this.cuas_remove_2seq;
// imp.cuas_remove_2seq_all = this.cuas_remove_2seq_all;
imp.cuas_min_seq = this.cuas_min_seq;
imp.cuas_min_seq_fl = this.cuas_min_seq_fl;
imp.cuas_max_mismatch = this.cuas_max_mismatch;
imp.cuas_good_mismatch = this.cuas_good_mismatch;
imp.cuas_fail_mismatch = this.cuas_fail_mismatch;
imp.cuas_ignore_mismatch = this.cuas_ignore_mismatch;
imp.cuas_by_horizon = this.cuas_by_horizon;
......
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