Skip to content

I
imagej-elphel
Commit 03ff002c authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

Before terrain elevation

parent 6a053711
Show whitespace changes
Inline Side-by-side
Showing with 220 additions and 68 deletions
src/main/java/com/elphel/imagej/tileprocessor/IntersceneMatchParameters.java
View file @ 03ff002c
......@@ -805,10 +805,12 @@ min_str_neib_fpn 0.35
public double terr_alpha_loss_lin = 0.0;
public double terr_alpha_offset = 0.1; // alpha offset near alpha ~=1.0
public double terr_alpha_0offset = 0.0; // New - a separate alpha offset nea alpha ~= 0.0
public double terr_alpha_min_veg = -1; // old version 0.5; // Minimal vegetation alpha. If (alpha-alpha_offset)/(1-2*alpha_offset) < alpha_min_veg, pull down to lpha_offset
public double terr_alpha_min_veg = 0.5; // old version 0.5; // Minimal vegetation alpha. If (alpha-alpha_offset)/(1-2*alpha_offset) < alpha_min_veg, pull down to lpha_offset
public double terr_alpha_max_terrain = 0.75;// increase pull vegetation if below
public double terr_alpha_pull_pwr = 1.0; // raise extra pull to that power
public double terr_alpha_lpf = 2.5; // pull to average of 4 neighbors
public double terr_alpha_lpf_border = 1.0; // pull to average of 4 neighbors for border tiles (to keep stable)
public boolean terr_alpha_piece_linear = true;
public double terr_alpha_scale_avg = 1.0; // scale average alpha (around 0.5) when pulling to it
public double terr_alpha_push = 12; // push from alpha==0.5
......@@ -824,6 +826,7 @@ min_str_neib_fpn 0.35
public double terr_terr_pull_up= 0.25; // pull terrain to initial when it is colder
public double terr_terr_pull_avg= 0.1; // Pull terrain to the initial offset by the average offset of all terrain pixels
public double terr_veget_pull0 = 5.0; // pull vegetation initial (pre-adjustment) values
public double terr_veget_pull_low_alpha = 10; // scale (boost) pull0 for low alpha (mostly terrain)
public double terr_elev_pull0 = 1.0; // pull elevation to initial (pre-adjustment) values
public boolean terr_elev_alpha_en = false;// Enable loss for low vegetation with high opacity
public double terr_elev_alpha = 1.0; // multiply alpha by under-low elevation for loss
......@@ -2154,8 +2157,11 @@ min_str_neib_fpn 0.35
gd.addNumericField("Alpha offset @1.0", terr_alpha_offset, 5,7,"", "Start alpha losses below 1.0 by this value.");
gd.addNumericField("Alpha offset @0.0", terr_alpha_0offset, 5,7,"", "Start alpha losses above 0.0 by this value.");
gd.addNumericField("Minimal vegetation alpha", terr_alpha_min_veg, 5,7,"","Minimal vegetation alpha. If (alpha-alpha_offset)/(1-2*alpha_offset) < alpha_min_veg, pull down to lpha_offset.");
gd.addNumericField("Maximal terrain alpha",terr_alpha_max_terrain, 5,7,"","Increase pull vegetation if below.");
gd.addNumericField("Extra pull power", terr_alpha_pull_pwr, 5,7,"","Raise extra pull (below maximal terrain alpha) to that power.");
gd.addNumericField("Alpha diffusion", terr_alpha_lpf, 5,7,"", "Alpha diffusion to 4 ortho neighbors.");
gd.addNumericField("Alpha diffusion border",terr_alpha_lpf_border, 5,7,"","Alpha diffusion to ortho neighbors on the border (for stability with low alpha diffusion).");
gd.addCheckbox ("Alpha piece-linear", terr_alpha_piece_linear, "Piece-linear alpha (_/\u203E, false - 0.0-cosine-1.0.");
gd.addNumericField("Scale alpha", terr_alpha_scale_avg, 5,7,"","Scale target (average of neighbors) alpha before pulling to it (not used now).");
gd.addNumericField("Push alpha", terr_alpha_push, 5,7,"", "Quadratic loss for middle alpha (push to 0.0 or 1.0.");
......@@ -2171,8 +2177,9 @@ min_str_neib_fpn 0.35
gd.addNumericField("Terrain pull up", terr_terr_pull_up, 5,7,"", "Terrain pixels pull to initial (pre-adjustment) values when it is colder than initial (<0 - sqme as above).");
gd.addNumericField("Terrain pull to average",terr_terr_pull_avg, 5,7,"","Pull terrain to the initial offset by the average offset of all terrain pixels.");
gd.addNumericField("Vegetation pull", terr_veget_pull0, 5,7,"", "Vegetation pixels pull initial (pre-adjustment) values.");
gd.addNumericField("Elevation pull", terr_elev_pull0, 5,7,"", "Elevation pixels pull to initial (pre-adjustment) values.");
gd.addNumericField("Boost for low alpha", terr_veget_pull_low_alpha, 5,7,"x", "Scale vegetation pull (terr_veget_pull0) for low alpha (mostly terrain) .");
gd.addNumericField("Elevation pull", terr_elev_pull0, 5,7,"", "Elevation pixels pull to initial (pre-adjustment) values.");
gd.addCheckbox ("Enable low vegetation",terr_elev_alpha_en, "Enable loss for low vegetation with high opacity.");
gd.addNumericField("Low vegetation loss", terr_elev_alpha, 5,7,"", "Multiply alpha by under-low elevation for loss.");
gd.addNumericField("Low vegetation power", terr_elev_alpha_pwr, 5,7,"", "Raise alpha to this power for low vegetation loss.");
......@@ -2933,7 +2940,11 @@ min_str_neib_fpn 0.35
terr_alpha_offset = gd.getNextNumber();// double
terr_alpha_0offset = gd.getNextNumber();// double
terr_alpha_min_veg = gd.getNextNumber();// double
terr_alpha_max_terrain = gd.getNextNumber();// double
terr_alpha_pull_pwr = gd.getNextNumber();// double
terr_alpha_lpf = gd.getNextNumber();// double
terr_alpha_lpf_border = gd.getNextNumber();// double
terr_alpha_piece_linear = gd.getNextBoolean();// boolean
terr_alpha_scale_avg = gd.getNextNumber();// double
terr_alpha_push = gd.getNextNumber();// double
......@@ -2950,6 +2961,7 @@ min_str_neib_fpn 0.35
terr_terr_pull_up = gd.getNextNumber();// double
terr_terr_pull_avg = gd.getNextNumber();// double
terr_veget_pull0 = gd.getNextNumber();// double
terr_veget_pull_low_alpha= gd.getNextNumber();// double
terr_elev_pull0 = gd.getNextNumber();// double
terr_elev_alpha_en = gd.getNextBoolean();// boolean
terr_elev_alpha = gd.getNextNumber();// double
......@@ -3674,7 +3686,10 @@ min_str_neib_fpn 0.35
properties.setProperty(prefix+"terr_alpha_offset", terr_alpha_offset+""); // double
properties.setProperty(prefix+"terr_alpha_0offset", terr_alpha_0offset+""); // double
properties.setProperty(prefix+"terr_alpha_min_veg", terr_alpha_min_veg+""); // double
properties.setProperty(prefix+"terr_alpha_max_terrain", terr_alpha_max_terrain+""); // double
properties.setProperty(prefix+"terr_alpha_pull_pwr", terr_alpha_pull_pwr+""); // double
properties.setProperty(prefix+"terr_alpha_lpf", terr_alpha_lpf+""); // double
properties.setProperty(prefix+"terr_alpha_lpf_border", terr_alpha_lpf_border+""); // double
properties.setProperty(prefix+"terr_alpha_piece_linear", terr_alpha_piece_linear+""); // boolean
properties.setProperty(prefix+"terr_alpha_scale_avg", terr_alpha_scale_avg+""); // double
properties.setProperty(prefix+"terr_alpha_push", terr_alpha_push+""); // double
......@@ -3691,6 +3706,7 @@ min_str_neib_fpn 0.35
properties.setProperty(prefix+"terr_terr_pull_up", terr_terr_pull_up+""); // double
properties.setProperty(prefix+"terr_terr_pull_avg", terr_terr_pull_avg+""); // double
properties.setProperty(prefix+"terr_veget_pull0", terr_veget_pull0+""); // double
properties.setProperty(prefix+"terr_veget_pull_low_alpha", terr_veget_pull_low_alpha+"");// double
properties.setProperty(prefix+"terr_elev_pull0", terr_elev_pull0+""); // double
properties.setProperty(prefix+"terr_elev_alpha_en", terr_elev_alpha_en+""); // boolean
properties.setProperty(prefix+"terr_elev_alpha", terr_elev_alpha+""); // double
......@@ -4435,7 +4451,10 @@ min_str_neib_fpn 0.35
if (properties.getProperty(prefix+"terr_alpha_offset")!= null) terr_alpha_offset=Double.parseDouble(properties.getProperty(prefix+"terr_alpha_offset"));
if (properties.getProperty(prefix+"terr_alpha_0offset")!= null) terr_alpha_0offset=Double.parseDouble(properties.getProperty(prefix+"terr_alpha_0offset"));
if (properties.getProperty(prefix+"terr_alpha_min_veg")!= null) terr_alpha_min_veg=Double.parseDouble(properties.getProperty(prefix+"terr_alpha_min_veg"));
if (properties.getProperty(prefix+"terr_alpha_max_terrain")!= null) terr_alpha_max_terrain=Double.parseDouble(properties.getProperty(prefix+"terr_alpha_max_terrain"));
if (properties.getProperty(prefix+"terr_alpha_pull_pwr")!= null) terr_alpha_pull_pwr=Double.parseDouble(properties.getProperty(prefix+"terr_alpha_pull_pwr"));
if (properties.getProperty(prefix+"terr_alpha_lpf")!= null) terr_alpha_lpf=Double.parseDouble(properties.getProperty(prefix+"terr_alpha_lpf"));
if (properties.getProperty(prefix+"terr_alpha_lpf_border")!= null) terr_alpha_lpf_border=Double.parseDouble(properties.getProperty(prefix+"terr_alpha_lpf_border"));
if (properties.getProperty(prefix+"terr_alpha_piece_linear")!= null) terr_alpha_piece_linear=Boolean.parseBoolean(properties.getProperty(prefix+"terr_alpha_piece_linear"));
if (properties.getProperty(prefix+"terr_alpha_scale_avg")!= null) terr_alpha_scale_avg=Double.parseDouble(properties.getProperty(prefix+"terr_alpha_scale_avg"));
if (properties.getProperty(prefix+"terr_alpha_push")!= null) terr_alpha_push=Double.parseDouble(properties.getProperty(prefix+"terr_alpha_push"));
......@@ -4452,6 +4471,7 @@ min_str_neib_fpn 0.35
if (properties.getProperty(prefix+"terr_terr_pull_up")!= null) terr_terr_pull_up=Double.parseDouble(properties.getProperty(prefix+"terr_terr_pull_up"));
if (properties.getProperty(prefix+"terr_terr_pull_avg")!= null) terr_terr_pull_avg=Double.parseDouble(properties.getProperty(prefix+"terr_terr_pull_avg"));
if (properties.getProperty(prefix+"terr_veget_pull0")!= null) terr_veget_pull0=Double.parseDouble(properties.getProperty(prefix+"terr_veget_pull0"));
if (properties.getProperty(prefix+"terr_veget_pull_low_alpha")!= null)terr_veget_pull_low_alpha=Double.parseDouble(properties.getProperty(prefix+"terr_veget_pull_low_alpha"));
if (properties.getProperty(prefix+"terr_elev_pull0")!= null) terr_elev_pull0=Double.parseDouble(properties.getProperty(prefix+"terr_elev_pull0"));
if (properties.getProperty(prefix+"terr_elev_alpha_en")!= null) terr_elev_alpha_en=Boolean.parseBoolean(properties.getProperty(prefix+"terr_elev_alpha_en"));
if (properties.getProperty(prefix+"terr_elev_alpha")!= null) terr_elev_alpha=Double.parseDouble(properties.getProperty(prefix+"terr_elev_alpha"));
......@@ -5164,7 +5184,11 @@ min_str_neib_fpn 0.35
imp.terr_alpha_offset = this.terr_alpha_offset;
imp.terr_alpha_0offset = this.terr_alpha_0offset;
imp.terr_alpha_min_veg = this.terr_alpha_min_veg;
imp.terr_alpha_max_terrain = this.terr_alpha_max_terrain;
imp.terr_alpha_pull_pwr = this.terr_alpha_pull_pwr;
imp.terr_alpha_lpf = this.terr_alpha_lpf;
imp.terr_alpha_lpf_border = this.terr_alpha_lpf_border;
imp.terr_alpha_piece_linear = this.terr_alpha_piece_linear;
imp.terr_alpha_scale_avg = this.terr_alpha_scale_avg;
imp.terr_alpha_push = this.terr_alpha_push;
......@@ -5180,6 +5204,7 @@ min_str_neib_fpn 0.35
imp.terr_terr_pull_up = this.terr_terr_pull_up;
imp.terr_terr_pull_avg = this.terr_terr_pull_avg;
imp.terr_veget_pull0 = this.terr_veget_pull0;
imp.terr_veget_pull_low_alpha = this.terr_veget_pull_low_alpha;
imp.terr_elev_pull0 = this.terr_elev_pull0;
imp.terr_elev_alpha_en = this.terr_elev_alpha_en;
imp.terr_elev_alpha = this.terr_elev_alpha;
......
src/main/java/com/elphel/imagej/vegetation/VegetationLMA.java
View file @ 03ff002c
......@@ -149,8 +149,11 @@ public class VegetationLMA {
private double alpha_offset = 0; // (+) if >0, start losses below 1.0;
private double alpha_0offset = 0; // (+) if >0, start losses above 0.0
private double alpha_min_veg = 0.5; // (+) if (alpha-alpha_offset)/(1-2*alpha_offset) < alpha_min_veg, pull down to lpha_offset
private double alpha_max_terrain = 0.75; // (+) increase pull vegetation if below
private double alpha_pull_pwr = 1.0; // (+) raise extra pull to that power
private double alpha_lpf = 0; // (+)
private double alpha_lpf_border = 0; // (+)
private boolean alpha_piece_linear = true; // (+)
private double alpha_scale_avg = 1.0; // (+) 1.1; // scale average alpha (around 0.5) when pulling to it
private double alpha_push = 12.0; // (+) push from alpha==0.5
......@@ -172,6 +175,7 @@ public class VegetationLMA {
private double terr_pull_up = 0; // (+) Terrain pixels pull to initial (pre-adjustment) values when it is colder than initial
private double terr_pull_avg = 0; // (+) pull terrain to the initial offset by the average offset of all terrain pixels
private double veget_pull0 = 0; // (+) now - pull to vegetation_pull (extended vegetation)
private double veget_pull_low_alpha = 10; // () scale pull0 for low alpha (mostly terrain)
public double elevation_pull0 = 0; // (*) now - pull to initial elevation
public boolean elev_alpha_en = false;// (+) false; // Enable loss for low vegetation with high opacity
......@@ -441,7 +445,10 @@ public class VegetationLMA {
final double alpha_offset, // quadratic loss when alpha > 1 - alpha_offset
final double alpha_0offset, // quadratic loss when alpha < alpha0_offset
final double alpha_min_veg, // 0.5; // if (alpha-alpha_offset)/(1-2*alpha_offset) < alpha_min_veg, pull down to lpha_offset
final double alpha_max_terrain, // 0.75; // () increase pull vegetation if below
final double alpha_pull_pwr, // 1.0; // () raise extra pull to that power
final double alpha_lpf, // pull vegetation alpha to average of 4 neighbors
final double alpha_lpf_border, // pull to average of 4 neighbors for border tiles (to keep stable)
final boolean alpha_piece_linear, // true - piece-linear, false - half-cosine
final double alpha_scale_avg, // = 1.2; // scale average alpha (around 0.5) when pulling to it
final double alpha_push, // 5.0; // push from alpha==0.5
......@@ -457,6 +464,7 @@ public class VegetationLMA {
final double terr_pull_up, // Terrain pixels pull to initial (pre-adjustment) values when it is colder than initial.
final double terr_pull_avg, // pull terrain to the initial offset by the average offset of all terrain pixels
final double veget_pull0, // pull vegetation to initial (pre-adjustment) values
final double veget_pull_low_alpha, // 10; // ()scale pull0 for low alpha (mostly terrain)
final double elev_pull0, // pull elevation to initial (pre-adjustment) values
final boolean elev_alpha_en, // false; // Enable loss for low vegetation with high opacity
final double elev_alpha, // 1.0; // multiply alpha by under-low elevation for loss
......@@ -498,7 +506,10 @@ public class VegetationLMA {
this.alpha_offset = alpha_offset;
this.alpha_0offset = alpha_0offset;
this.alpha_min_veg = Math.max(alpha_min_veg,0);
this.alpha_max_terrain = Math.max(alpha_max_terrain,0);
this.alpha_pull_pwr = alpha_pull_pwr;
this.alpha_lpf = alpha_lpf;
this.alpha_lpf_border = alpha_lpf_border;
this.alpha_scale_avg = alpha_scale_avg;
this.alpha_piece_linear= alpha_piece_linear;
this.alpha_push = alpha_push; // 5.0; // push from alpha==0.5
......@@ -513,6 +524,7 @@ public class VegetationLMA {
this.terr_pull_up= (terr_pull_up > 0) ? terr_pull_up : terr_pull0;
this.terr_pull_avg = terr_pull_avg;
this.veget_pull0 = veget_pull0;
this.veget_pull_low_alpha = veget_pull_low_alpha;
this.elevation_pull0 = elev_pull0;
this.elev_alpha_en = elev_alpha_en;
this.elev_alpha = elev_alpha;
......@@ -1138,6 +1150,7 @@ public class VegetationLMA {
boolean show_all = debug_level > 4;
debugImageSaveShow(
parameters_vector, // double [] vector
last_ymfx, // double [] ymfx,
last_rms, // double [] rms,
save_dir, // String save_dir, // save if not null
debug_title, // String title, // not null
......@@ -1260,6 +1273,7 @@ public class VegetationLMA {
}
this.good_or_bad_rms = rms.clone();
double [] dbg_ymfx = last_ymfx;
if (rms[0] < this.last_rms[0]) { // improved
rslt[0] = true;
rslt[1] = rms[0] >=(this.last_rms[0] * (1.0 - rms_diff));
......@@ -1315,8 +1329,9 @@ public class VegetationLMA {
boolean save_all = (debug_image != null);
boolean show_this = debug_level > 3;
boolean show_all = debug_level > 4;
debugImageSaveShow(
debugImageSaveShow( // Uses last_ymfx which is already restored to previous
new_vector, // double [] vector
dbg_ymfx, // double [] ymfx,
rms, // double [] rms,
save_dir, // String save_dir, // save if not null
debug_title, // String title, // not null
......@@ -1377,16 +1392,18 @@ public class VegetationLMA {
public String getParametersDebugTitle(boolean short_name) {
// alpha_en_holes -> alpha_mm_hole = NaN;
// hifreq_weight
String debug_title = "parameters_vector-x"+woi.x+"-y"+woi.y+"-w"+woi.width+"-h"+woi.height;
String debug_title = "par_vec-x"+woi.x+"-y"+woi.y+"-w"+woi.width+"-h"+woi.height;
if (!short_name) {
debug_title += "-hf"+hifreq_weight+"-tc"+terrain_correction;
debug_title += "-al"+alpha_loss+"-alo"+alpha_offset+"-al0o"+alpha_0offset+"-amv"+alpha_min_veg+"-alp"+alpha_lpf+"-als"+alpha_scale_avg+(alpha_piece_linear?"-alin":"-acos");
debug_title += "-ap"+alpha_push+"-apn"+alpha_push_neutral+"-apc"+alpha_push_center+(alpha_en_holes?("-amm"+alpha_mm_hole):"");
debug_title += "-tl"+terr_lpf+"-vl"+veget_lpf+"-el"+elevation_lpf+"-tp"+terr_pull0+"-tu"+terr_pull_up+"-ta"+terr_pull_avg+"-vp"+veget_pull0+"-ep"+elevation_pull0;
debug_title += "hf"+hifreq_weight+"tc"+terrain_correction;
debug_title += "al"+alpha_loss+"all"+alpha_loss_lin+"alo"+alpha_offset+"al0o"+alpha_0offset+"amv"+alpha_min_veg+"amt"+alpha_max_terrain+"app"+alpha_pull_pwr;
debug_title += "alp"+alpha_lpf+"als"+alpha_scale_avg+(alpha_piece_linear?"alin":"acos");
debug_title += "ap"+alpha_push+"apn"+alpha_push_neutral+"apc"+alpha_push_center+(alpha_en_holes?("amm"+alpha_mm_hole):"");
debug_title += "tl"+terr_lpf+"vl"+veget_lpf+"el"+elevation_lpf+"tp"+terr_pull0+"tu"+terr_pull_up;
debug_title += "ta"+terr_pull_avg+"vp"+veget_pull0+"vpl"+veget_pull_low_alpha+"ep"+elevation_pull0;
if (elev_alpha_en) {
debug_title += "-ea"+elev_alpha+"-ep"+elev_alpha_pwr+"-lv"+low_veget;
debug_title += "ea"+elev_alpha+"ep"+elev_alpha_pwr+"lv"+low_veget;
}
debug_title += "-sp"+scenes_pull0+"-sp0"+ scenes_pull0+"-bp"+boost_parallax;
debug_title += "sp"+scenes_pull0+"sp0"+ scenes_pull0+"bp"+boost_parallax;
debug_title += from_file?"-file":"-new";
}
return debug_title;
......@@ -1400,6 +1417,7 @@ public class VegetationLMA {
public void debugImageSaveShow(
double [] vector,
double [] ymfx,
double [] rms,
String save_dir, // save if not null
String title, // not null
......@@ -1410,9 +1428,12 @@ public class VegetationLMA {
if (vector ==null) {
vector = parameters_vector;
}
if (ymfx==null) {
ymfx = last_ymfx;
}
double [] debug_img = parametersImage (
vector, // double [] vector,
show_extra ? last_ymfx : null, // double [] ymfx,
show_extra ? ymfx : null, // double [] ymfx,
1, // int gap)
wh,
null); // title);
......@@ -2316,6 +2337,10 @@ public class VegetationLMA {
final int dbg_n = -7402; // -69992;
final int fdbg_scene = dbg_scene;
final int dbg_cols=2,dbg_rows=2;
final double alpha_threshold = alpha_0offset + alpha_min_veg *(1 - alpha_offset - alpha_0offset);
// final double alpha_max_terrain = 0.75;
// final double alpha_pull_pwr = 1.0;
final double alpha_threshold_pull = alpha_0offset + alpha_max_terrain *(1 - alpha_offset - alpha_0offset);
for (int ithread = 0; ithread < threads.length; ithread++) {
threads[ithread] = new Thread() {
......@@ -2796,7 +2821,7 @@ public class VegetationLMA {
int dbg_nx = -120155; // 30578; // -120114; // -76340;
final boolean dbg_old = false;
// final double alpha_threshold = alpha_offset + alpha_min_veg *(1 - 2*alpha_offset);
final double alpha_threshold = alpha_0offset + alpha_min_veg *(1 - alpha_offset - alpha_0offset);
// final double alpha_threshold = alpha_0offset + alpha_min_veg *(1 - alpha_offset - alpha_0offset);
final double alpha_plateau = alpha_threshold; // * alpha_loss;
ai.set(0);
for (int ithread = 0; ithread < threads.length; ithread++) {
......@@ -2904,6 +2929,7 @@ public class VegetationLMA {
fX[nx] = 0.0;
double avg = 0;
int nn = 0;
int nn_vector = 0;
double neib_min = Double.POSITIVE_INFINITY, neib_max = Double.NEGATIVE_INFINITY;
for (int i = 0; i < alpha_neibs[n].length; i++) { // now 4, may be increased
int di = alpha_neibs[n][i];
......@@ -2914,6 +2940,7 @@ public class VegetationLMA {
if (d < neib_min) neib_min = d;
if (d > neib_max) neib_max = d;
nn++;
nn_vector++;
} else if ((di < -1) && lpf_fixed[TVAO_ALPHA]) {
d = tvao[TVAO_ALPHA][-di - 2];
avg+=d;
......@@ -2928,6 +2955,9 @@ public class VegetationLMA {
//alpha_scale_avg
double mm = neib_min + (neib_max-neib_min) * alpha_mm_hole;
double effective_alpha_lpf = alpha_lpf;
if (nn_vector < 4) {
effective_alpha_lpf = alpha_lpf_border;
}
if (alpha_en_holes && !Double.isNaN(alpha_mm_hole) && (vector[np] <= mm) && ((neib_max-neib_min) >= alpha_diff_hole)) {
effective_alpha_lpf = 0.0; // disable alpha_lpf
}
......@@ -3110,11 +3140,38 @@ public class VegetationLMA {
if (Double.isNaN(veget_pull)) {
veget_pull= 0; // should not happen unless too far from the vegetation
}
fX[nx] += veget_pull0 * (vector[np] - veget_pull);
// find alpha
boolean holes_flat = false; // true;
double delta_veget = vector[np] - veget_pull;
double pull = veget_pull0;
if (veget_pull_low_alpha > 0) {
double scaled_pull = veget_pull_low_alpha * veget_pull0;
int npa = par_index[TVAO_ALPHA][findx]; // parameter for same-pixel alpha
// int na = npa - ind_pars[TVAO_ALPHA];
if (npa < 0) {
System.out.println("getFxDerivs(): BUG: no alpha for vegetation, n="+n+", np="+np+", nx ="+nx+
" findx="+findx+", npa="+npa);
} else {
double alpha = vector[npa];
if (alpha < alpha_threshold_pull) {
double k = (alpha_threshold_pull-alpha)/ alpha_threshold_pull;
double extra_pull;
if (holes_flat) {
extra_pull = scaled_pull;
} else {
extra_pull = scaled_pull * Math.pow(k, alpha_pull_pwr);
if (jt != null) { // d/d_alpha
jt[npa][nx] += -scaled_pull * alpha_pull_pwr * delta_veget * Math.pow(k, alpha_pull_pwr - 1) / alpha_threshold_pull;
}
}
pull = veget_pull0 + extra_pull;
}
}
}
fX[nx] += pull * delta_veget; // (vector[np] - veget_pull);
if (jt != null) {
jt[np][nx] += veget_pull0;
jt[np][nx] += pull;
}
}
}
}
......@@ -3169,7 +3226,7 @@ public class VegetationLMA {
if (veget_lap >=0) { // only for cold spots
continue;
}
d = vector[npa];
d = vector[npa]; // alpha
double alpha_avg5;
if (alpha_piece_linear) {
alpha_avg5 = (d < 0)? 0: ((d > 1) ? 1.0: d);
......@@ -3184,6 +3241,8 @@ public class VegetationLMA {
d = vector[di]; // d - full parameter index
} else if ((di < -1) && lpf_fixed[TVAO_ALPHA]) {
d = tvao[TVAO_ALPHA][-di - 2];
} else {
continue; // do not add weight
}
double alpha;
......@@ -3198,6 +3257,8 @@ public class VegetationLMA {
}
// limit to 0..1 and apply cos
alpha_avg5 /= alpha_w5; // average
if (alpha_avg5 > alpha_threshold) {
alpha_avg5 = (alpha_avg5 - alpha_threshold) / (1.0 - alpha_threshold);
double alpha_pwr = Math.pow(alpha_avg5, holes_pwr);
double val = veget_lap * alpha_pwr;
fX[nx] += veget_lpf * val;
......@@ -3214,7 +3275,8 @@ public class VegetationLMA {
double dval_dalpha_pwr = veget_lpf * veget_lap;
double dalpha_pwr_dalpha = holes_pwr* Math.pow(alpha_avg5, holes_pwr - 1);
double dval_dalpha = dval_dalpha_pwr * dalpha_pwr_dalpha;
double dalpha_dai = 1.0 / alpha_w5; // dval_dalpha / alpha_w5;
/// double dalpha_dai = 1.0 / alpha_w5; // dval_dalpha / alpha_w5;
double dalpha_dai = 1.0 / alpha_w5 / (1.0 - alpha_threshold); // dval_dalpha / alpha_w5;
if ((vector[npa] > 0) && (vector[npa] < 1.0)) {
if (!alpha_piece_linear) {
dalpha_dai *= 0.5 * Math.PI * Math.sin(vector[npa]*Math.PI);
......@@ -3225,8 +3287,9 @@ public class VegetationLMA {
int di = alpha_neibs[na][i];
if (di >= 0) {
if ((vector[di] > 0) && (vector[di] < 1.0)) {
// dalpha_dai = dval_dalpha * w_alpha_neib / alpha_w5;
dalpha_dai = w_alpha_neib / alpha_w5;
// dalpha_dai = dval_dalpha * w_alpha_neib / alpha_w5;
/// dalpha_dai = w_alpha_neib / alpha_w5;
dalpha_dai = w_alpha_neib / alpha_w5 / (1.0 - alpha_threshold);
if (!alpha_piece_linear) {
dalpha_dai *= 0.5 * Math.PI * Math.sin(vector[di]*Math.PI);
}
......@@ -3238,6 +3301,7 @@ public class VegetationLMA {
}
}
}
}
};
}
ImageDtt.startAndJoin(threads);
......@@ -3550,7 +3614,7 @@ public class VegetationLMA {
double [] vector,
final double delta,
final int debug_level) {
int dbg_n = -2256; // 1698; // -2486;
int dbg_n = 1067; // -2256; // 1698; // -2486;
double [][] jt = new double [vector.length][weights.length];
for (int nv = 0; nv < vector.length; nv++) {
if (nv == dbg_n) {
......@@ -3994,7 +4058,10 @@ public class VegetationLMA {
imp.setProperty("ALPHA_OFFSET", ""+alpha_offset);
imp.setProperty("ALPHA_0OFFSET", ""+alpha_0offset);
imp.setProperty("ALPHA_MIN_VEG", ""+alpha_min_veg);
imp.setProperty("ALPHA_MAX_TERRAIN", ""+alpha_max_terrain);
imp.setProperty("ALPHA_PULL_PWR", ""+alpha_pull_pwr);
imp.setProperty("ALPHA_LPF", ""+alpha_lpf);
imp.setProperty("ALPHA_LPF_BORDER", ""+alpha_lpf_border);
imp.setProperty("ALPHA_PIECE_LINEAR", ""+alpha_piece_linear);
imp.setProperty("ALPHA_SCALE_AVG", ""+alpha_scale_avg);
imp.setProperty("ALPHA_PUSH", ""+alpha_push);
......@@ -4018,6 +4085,9 @@ public class VegetationLMA {
imp.setProperty("TERR_PULL_UP", ""+terr_pull_up);
imp.setProperty("TERR_PULL_AVG", ""+terr_pull_avg);
imp.setProperty("VEGET_PULL0", ""+veget_pull0);
imp.setProperty("VEGET_PULL_LOW_ALPHA", ""+veget_pull_low_alpha);
imp.setProperty("ELEVATION_PULL0", ""+elevation_pull0);
imp.setProperty("ELEV_ALPHA_EN", ""+elev_alpha_en);
imp.setProperty("ELEV_ALPHA", ""+elev_alpha);
......@@ -4196,8 +4266,11 @@ public class VegetationLMA {
alpha_loss_lin = getProperty(imp_pars,"ALPHA_LOSS_LIN", alpha_loss_lin);
alpha_offset = getProperty(imp_pars,"ALPHA_OFFSET", alpha_offset);
alpha_0offset = getProperty(imp_pars,"ALPHA_0OFFSET", alpha_0offset);
alpha_min_veg = getProperty(imp_pars,"ALPHA_MIN_VEG",alpha_min_veg);
alpha_lpf = Double.parseDouble((String) imp_pars.getProperty("ALPHA_LPF"));
alpha_min_veg = getProperty(imp_pars,"ALPHA_MIN_VEG", alpha_min_veg);
alpha_max_terrain = getProperty(imp_pars,"ALPHA_MAX_TERRAIN", alpha_max_terrain);
alpha_pull_pwr = getProperty(imp_pars,"ALPHA_PULL_PWR", alpha_pull_pwr);
alpha_lpf = getProperty(imp_pars,"ALPHA_LPF", alpha_lpf);
alpha_lpf_border = getProperty(imp_pars,"ALPHA_LPF_BORDER", alpha_lpf_border);
alpha_piece_linear = Boolean.parseBoolean((String) imp_pars.getProperty("ALPHA_PIECE_LINEAR"));
alpha_scale_avg = Double.parseDouble((String) imp_pars.getProperty("ALPHA_SCALE_AVG"));
alpha_push = Double.parseDouble((String) imp_pars.getProperty("ALPHA_PUSH"));
......@@ -4217,11 +4290,13 @@ public class VegetationLMA {
lpf_fixed[TVAO_ALPHA] = Boolean.parseBoolean((String) imp_pars.getProperty("LPF_FIXED_ALPHA"));
lpf_fixed[TVAO_ELEVATION] = Boolean.parseBoolean((String) imp_pars.getProperty("LPF_FIXED_ELEVATION"));
lpf_fixed[TVAO_SCENE_OFFSET]=Boolean.parseBoolean((String)imp_pars.getProperty("LPF_FIXED_SCENE_OFFSET"));
terr_pull0 = Double.parseDouble((String) imp_pars.getProperty("TERR_PULL0"));
terr_pull_up = Double.parseDouble((String) imp_pars.getProperty("TERR_PULL_UP"));
terr_pull_avg = Double.parseDouble((String) imp_pars.getProperty("TERR_PULL_AVG"));
veget_pull0 = Double.parseDouble((String) imp_pars.getProperty("VEGET_PULL0"));
elevation_pull0 = Double.parseDouble((String) imp_pars.getProperty("ELEVATION_PULL0"));
terr_pull0= getProperty(imp_pars,"TERR_PULL0", terr_pull0);
terr_pull_up= getProperty(imp_pars,"TERR_PULL_UP", terr_pull_up);
terr_pull_avg= getProperty(imp_pars,"TERR_PULL_AVG", terr_pull_avg);
veget_pull0= getProperty(imp_pars,"VEGET_PULL0", veget_pull0);
veget_pull_low_alpha= getProperty(imp_pars,"VEGET_PULL_LOW_ALPHA", veget_pull_low_alpha);
elevation_pull0= getProperty(imp_pars,"ELEVATION_PULL0", elevation_pull0);
// renew above using getProperty(,,);
elev_alpha_en= getProperty(imp_pars,"ELEV_ALPHA_EN", elev_alpha_en);
elev_alpha = getProperty(imp_pars,"ELEV_ALPHA", elev_alpha);
......@@ -4427,8 +4502,10 @@ public class VegetationLMA {
getProperty(imp_pars, "ALPHA_OFFSET", alpha_offset), // final double alpha_offset, // quadratic loss when alpha > 1 - alpha_offset
getProperty(imp_pars, "ALPHA_0OFFSET", alpha_0offset), // final double alpha_0offset, // quadratic loss when alpha < alpha0_offset
getProperty(imp_pars, "ALPHA_MIN_VEG", alpha_min_veg), // final double alpha_min_veg, // 0.5; // if (alpha-alpha_offset)/(1-2*alpha_offset) < alpha_min_veg, pull down to lpha_offset
getProperty(imp_pars, "ALPHA_LPF", alpha_lpf), // final double alpha_lpf, // pull to average of 4 neighbors
getProperty(imp_pars, "ALPHA_MAX_TERRAIN", alpha_max_terrain), // final double alpha_max_terrain, // 0.75; // () increase pull vegetation if below
getProperty(imp_pars, "ALPHA_PULL_PWR", alpha_pull_pwr), // final double alpha_pull_pwr, // 1.0; // () raise extra pull to that power
getProperty(imp_pars, "ALPHA_LPF", alpha_lpf), // final double alpha_lpf_border, // pull to average of 4 neighbors for border tiles (to keep stable)
getProperty(imp_pars, "ALPHA_LPF_BORDER", alpha_lpf_border), // final double alpha_lpf, // pull to average of 4 neighbors
getProperty(imp_pars, "ALPHA_PIECE_LINEAR", alpha_piece_linear), // final boolean alpha_piece_linear, // true - piece-linear, false - half-cosine
getProperty(imp_pars, "ALPHA_SCALE_AVG", alpha_scale_avg), // final double alpha_scale_avg, // = 1.2; // scale average alpha (around 0.5) when pulling to it
getProperty(imp_pars, "ALPHA_PUSH", alpha_push), // final double alpha_push, // 5.0; // push from alpha==0.5
......@@ -4444,6 +4521,7 @@ public class VegetationLMA {
getProperty(imp_pars, "TERR_PULL_UP", terr_pull_up), // final double terr_pull_up, // Terrain pixels pull to initial (pre-adjustment) values when it is colder than initial.
getProperty(imp_pars, "TERR_PULL_AVG", terr_pull_avg), // final double terr_pull_avg, // pull terrain to the initial offset by the average offset of all terrain pixels
getProperty(imp_pars, "VEGET_PULL0", veget_pull0), // final double veget_pull0, // pull vegetation to initial (pre-adjustment) values
getProperty(imp_pars, "VEGET_PULL_LOW_ALPHA",veget_pull_low_alpha), // final double veget_pull_low_alpha, // 10; // ()scale pull0 for low alpha (mostly terrain)
getProperty(imp_pars, "ELEVATION_PULL0", elevation_pull0), // final double elev_pull0, // pull elevation to initial (pre-adjustment) values
getProperty(imp_pars, "ELEV_ALPHA_EN", elev_alpha_en), // final boolean elev_alpha_en, // false; // Enable loss for low vegetation with high opacity
getProperty(imp_pars, "ELEV_ALPHA", elev_alpha), // final double elev_alpha, // 1.0; // multiply alpha by under-low elevation for loss
......@@ -4903,14 +4981,42 @@ public class VegetationLMA {
for (int n = 0; n < jt_diff.length; n++) {
for (int w = 0; w < jt_diff[0].length; w++) {
jt_diff[n][w] = jt[n][w] - jt_delta[n][w];
if ((Math.abs(jt_diff[n][w]) > max_err) || (Math.abs(jt_diff[n][w]) > .001)) {
int [] typ_offs = samplesTypeOffset(w);
int [] ti = par_rindex[n];
String s1 = String.format("n=%5d (%2d:%6d), w= %6d (%2d:%6d)",n, ti[0], ti[1], w, typ_offs[0],typ_offs[1]);
String s2 = String.format(" diff=%12g, jt=%12.8f, jt_delta=%12.8f",jt_diff[n][w],jt[n][w],jt_delta[n][w]);
String s3 = String.format("%53s","");
if (typ_offs[0] == SAMPLES_Y) {
int ny = typ_offs[1];
int nscene = y_src[ny][YSRC_SCENE];
int findx = y_src[ny][YSRC_FINDEX];
int windx = getWoiIndex(null, woi, full, findx); // getWindexFromFindex(findx);
int x = findx % full.width;
int y = findx / full.width;
int wx = windx % woi.width;
int wy = windx / woi.width;
s3 = String.format(" scene=%3d, findx=%6d(%3d:%3d), windx=%4d(%2d:%2d)",nscene,findx,x,y,windx,wx,wy);
} else if (typ_offs[0] == SAMPLES_Y_HF) {
int ny = typ_offs[1];
int nscene = y_src_hf[ny][YSRC_SCENE];
int findx = y_src_hf[ny][YSRC_FINDEX];
int windx = getWoiIndex(null, woi, full, findx); //; // getWindexFromFindex(findx);
int x = findx % full.width;
int y = findx / full.width;
int wx = windx % woi.width;
int wy = windx / woi.width;
s3 = String.format(" *scene=%3d, findx=%6d(%3d:%3d), windx=%4d(%2d:%2d)",nscene,findx,x,y,windx,wx,wy);
}
if (Math.abs(jt_diff[n][w]) > max_err) {
System.out.println("debugDerivs(): n="+n+" ("+ti[0]+":"+ti[1]+"), w = "+w +", diff="+jt_diff[n][w]+" jt="+jt[n][w]+" jt_delta="+jt_delta[n][w]);
System.out.println("debugDerivs(): "+s1+s3+s2);
} else if (Math.abs(jt_diff[n][w]) > .001) {
System.out.println("debugDerivs(): n="+n+" ("+ti[0]+":"+ti[1]+"), w = "+w +", diff="+jt_diff[n][w]+" jt="+jt[n][w]+" jt_delta="+jt_delta[n][w]);
System.out.println("debugDerivs(): "+s1+s3+s2);
}
max_err = Math.max(max_err, Math.abs(jt_diff[n][w]));
}
// max_err = Math.max(max_err, Math.abs(jt_diff[n][w]));
}
}
System.out.println("delta = "+delta+", max_err = "+max_err);
// think of visualization
......@@ -4923,6 +5029,16 @@ public class VegetationLMA {
return max_err;
}
public int [] samplesTypeOffset (int sample_index) {
for (int typ = 0; typ < SAMPLES_TOTAL; typ++) {
if (samples_pointers[typ+1][0]>sample_index) {
return new int [] {typ , sample_index - samples_pointers[typ][0]};
}
}
return null;
}
private void setupWeights( // after setupParametersIndices
final double [] scene_weights_in,
final double reg_weights, // relative to y_vector samples -> fraction of 1.0
......@@ -4949,7 +5065,7 @@ public class VegetationLMA {
samples_pointers[SAMPLES_ALPHA_PULL][1] = num_pars[TVAO_ALPHA];
samples_pointers[SAMPLES_ALPHA_PULL][2] = ind_pars[TVAO_ALPHA];
}
if (fits[TVAO_ALPHA] && (alpha_lpf >= 0)) {
if (fits[TVAO_ALPHA] && ((alpha_lpf >= 0) || (alpha_lpf_border >= 0))) {
samples_pointers[SAMPLES_ALPHA_LPF][1] = num_pars[TVAO_ALPHA];
samples_pointers[SAMPLES_ALPHA_LPF][2] = ind_pars[TVAO_ALPHA];
}
......
src/main/java/com/elphel/imagej/vegetation/VegetationModel.java
View file @ 03ff002c
......@@ -1516,7 +1516,11 @@ public class VegetationModel {
double alpha_0offset = clt_parameters.imp.terr_alpha_0offset; // 0.0; // if >0, start losses above 0.0
double alpha_min_veg = clt_parameters.imp.terr_alpha_min_veg; // 0.5 // Minimal vegetation alpha. If (alpha-alpha_offset)/(1-2*alpha_offset) < alpha_min_veg, pull down to lpha_offset
double alpha_max_terrain = clt_parameters.imp.terr_alpha_max_terrain; // 0.75; // () increase pull vegetation if below
double alpha_pull_pwr = clt_parameters.imp.terr_alpha_pull_pwr; // 1.0; // () raise extra pull to that power
double alpha_lpf = clt_parameters.imp.terr_alpha_lpf; // 2.5; // 5; /// 2; // 5; /// 10; /// 15; // 10.0; // 5.0; // 10.0; // 3; // 10; // 20; // 6.0; // 3.0; // 2.0; // 1.5; // 5.0; // 0.5; // pull to average of 4 neighbors
double alpha_lpf_border = clt_parameters.imp.terr_alpha_lpf_border; // 10.0; // pull to average of 4 neighbors for border tiles (to keep stable)
boolean alpha_piece_linear =clt_parameters.imp.terr_alpha_piece_linear; // true; // false; // true;
double alpha_scale_avg = clt_parameters.imp.terr_alpha_scale_avg; // 1.0; // 1.1; // 0.9; // 2.0; // 1.5; // scale average alpha (around 0.5) when pulling to it
double alpha_push = clt_parameters.imp.terr_alpha_push; // 12; // 10.0; // 15.0; // push from alpha==0.5
......@@ -1533,6 +1537,9 @@ public class VegetationModel {
double terr_pull_up = clt_parameters.imp.terr_terr_pull_up; // 0.2; // Terrain pixels pull to initial (pre-adjustment) values when it is colder than initial.
double terr_pull_avg = clt_parameters.imp.terr_terr_pull_avg; // 0.1; // Pull terrain to the initial offset by the average offset of all terrain pixels
double veget_pull0 = clt_parameters.imp.terr_veget_pull0; // 0.05; //0.1; // 0.03; ////// 0.05; ///// 0.1; //// 0.01; /// 0.1; // pull vegetation to zero (makes sense with UM
double veget_pull_low_alpha = clt_parameters.imp.terr_veget_pull_low_alpha; //10; // scale pull0 for low alpha (mostly terrain)
double elev_pull0 = clt_parameters.imp.terr_elev_pull0;
boolean elev_alpha_en= clt_parameters.imp.terr_elev_alpha_en; // false;// Enable loss for low vegetation with high opacity
double elev_alpha = clt_parameters.imp.terr_elev_alpha; // 1.0; // multiply alpha by under-low elevation for loss
......@@ -2095,7 +2102,10 @@ public class VegetationModel {
alpha_offset, // final double alpha_offset, // quadratic loss when alpha > 1.0 - alpha_offset
alpha_0offset, // final double alpha_0ffset, // quadratic loss when alpha < alpha0_offset
alpha_min_veg, // final double alpha_min_veg, // 0.5; // if (alpha-alpha_offset)/(1-2*alpha_offset) < alpha_min_veg, pull down to lpha_offset
alpha_max_terrain, // final double alpha_max_terrain, // 0.75; // () increase pull vegetation if below
alpha_pull_pwr, //final double alpha_pull_pwr, // 1.0; // () raise extra pull to that power
alpha_lpf, // final double alpha_lpf, // pull to average of 4 neighbors
alpha_lpf_border, // final double alpha_lpf_border, // pull to average of 4 neighbors for border tiles (to keep stable)
alpha_piece_linear, // final boolean alpha_piece_linear, // true - piece-linear, false - half-cosine
alpha_scale_avg, // final double alpha_scale_avg, // = 1.2; // scale average alpha (around 0.5) when pulling to it
alpha_push, // final double alpha_push, // 5.0; // push from alpha==0.5
......@@ -2111,6 +2121,7 @@ public class VegetationModel {
terr_pull_up, // final double terr_pull_up, // Terrain pixels pull to initial (pre-adjustment) values when it is colder than initial.
terr_pull_avg, // final double terr_pull_avg, // pull terrain to the initial offset by the average offset of all terrain pixels
veget_pull0, // final double veget_pull0, // pull vegetation to initial (pre-adjustment) values
veget_pull_low_alpha, //final double veget_pull_low_alpha, // 10; // ()scale pull0 for low alpha (mostly terrain)
elev_pull0, // final double elev_pull0, // pull elevation to initial (pre-adjustment) values
elev_alpha_en, // final boolean elev_alpha_en, // false; // Enable loss for low vegetation with high opacity
elev_alpha, // final double elev_alpha, // 1.0; // multiply alpha by under-low elevation for loss
......@@ -2207,7 +2218,7 @@ public class VegetationModel {
}
if ((show_final_result) && (debugLevel > -2)) { // 0)) {
String reconstructed_title = reference_scene+"-reconstructed-pre-step"+step_restore; //
String reconstructed_title = reference_scene+"-recnstr-pre-step"+step_restore; //
vegetationLMA.showYfX(
null, // double [] vector,
reconstructed_title); // String title)
......@@ -2328,7 +2339,7 @@ public class VegetationModel {
// continue;
}
if (show_final_result) {
String reconstructed_title = reference_scene+"-reconstructed-"+vegetationLMA.getParametersDebugTitle()+"-series"+last_series;
String reconstructed_title = reference_scene+"-recnstr-"+vegetationLMA.getParametersDebugTitle()+"-ser"+last_series;
vegetationLMA.showYfX(
null, // double [] vector,
reconstructed_title); // String title)
......
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