Commit 03ff002c authored by Andrey Filippov's avatar Andrey Filippov

Before terrain elevation

parent 6a053711
......@@ -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