has bug, but worked without alpha_mm_hole (set it to Double.NaN)

src/main/java/com/elphel/imagej/vegetation/VegetationModel.java

@@ -678,19 +678,50 @@ public class VegetationModel {
 			int                debugLevel) {
 		boolean diff_mode = true;
 		Rectangle woi50 =       new Rectangle(143,317,35,35);
+		/* Bad, pull terr lower, so it all shifts to terrain
 		int       min_scenes =   10;
 		double    default_alpha = 0.8;
 		double    reg_weights =   0.25;        // fraction of the total weight used for regularization
-		double    alpha_loss =   10.0;  // 10000.0; // 1000.0; // 100.; // 10.0;         // quadratic loss when alpha reaches -1.0 or 2.0 
+		double    alpha_loss =   100.0; // 10.0;  // 10000.0; // 1000.0; // 100.; // 10.0;         // quadratic loss when alpha reaches -1.0 or 2.0 
 		double    alpha_offset =  0.0; // 0.02; // 0.03;    // if >0,  start losses above 0.0 and below 1.0;
-		double    alpha_lpf =     10;   // 20; // 6.0; // 3.0; // 2.0;    // 1.5; // 5.0; // 0.5;         // pull to average of 4 neighbors
-		double    terr_lpf =      0.1;    // pull terrain to average of 4 neighbors (very small)
-		double    veget_lpf =     0.1;    // pull vegetation to average of 4 neighbors (very small - maybe not needed)
-		double    terr_pull0 =    0.1;    //pull terrain to zero (makes sense with UM
-		double    veget_pull0 =   0.1;    // pull vegetation to zero (makes sense with UM
-		double    boost_parallax = 1.0; //  5;
+		double    alpha_lpf =    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
+		boolean   alpha_piece_linear = true;
+		double    terr_lpf =      0.1; // 0.15; /// 0.2;  /// 0.1;    // pull terrain to average of 4 neighbors (very small)
+		double    veget_lpf =     0.2; //0.15; /// 0.2; //// 0.01; /// 0.1;    // pull vegetation to average of 4 neighbors (very small - maybe not needed)
+		double    terr_pull0 =    0.03; ////// 0.05; ///// 0.1; //// 0.01; /// 0.2; /// 0.1;    //pull terrain to zero (makes sense with UM
+		double    veget_pull0 =   0.1; // 0.03; ////// 0.05; ///// 0.1; //// 0.01; /// 0.1;    // pull vegetation to zero (makes sense with UM
+		double    boost_parallax = 3.0; /// 1.0; /////// 5.0; /// 1.0; //  5;
 		boolean   next_run =      false;
-		boolean   read_pars =     true; //   false; // true;
+		boolean   read_pars =     true; /// false; /// true; //   false; // true;
+		double    threshold_terrain = 0.05;
+		double    min_max_terrain= 0.1;
+		double    min_terrain =    0.001;
+		double    min_vegetation = 0.5;				
+		boolean   um_en =     true;
+		double    um_sigma =  1.0; 
+		double    um_weight = 0.8;
+
+		 */
+		int       min_scenes =   1; // 10; // for new scenes only, for old ones use 10
+		double    default_alpha = 0.5; //  0.8;
+		double    reg_weights =   0.25;        // fraction of the total weight used for regularization
+		double    alpha_loss =   100.0; // 10.0; /// 100.0; // 10.0;  // 10000.0; // 1000.0; // 100.; // 10.0;         // quadratic loss when alpha reaches -1.0 or 2.0 
+		double    alpha_offset =  0.0; // 0.02; // 0.03;    // if >0,  start losses above 0.0 and below 1.0;
+		double    alpha_lpf =    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
+		boolean   alpha_piece_linear = true; // false; // true;
+		double    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 =       12; // 10.0; // 15.0;   // push from alpha==0.5
+		double    alpha_push_neutral = 0.8; // alpha point from which push (closer to opaque)
+		double    alpha_push_center = 1.5; // weight of center alpha pixel relative to each of the 4 ortho ones
+		double    alpha_mm_hole    = 0.1; // NaN to disable. Local "almost minimum" (lower than this fraction between min and max neighbor) is not subject to alpha_lpf
+		
+		double    terr_lpf =      0.1; // 0.15; /// 0.2;  /// 0.1;    // pull terrain to average of 4 neighbors (very small)
+		double    veget_lpf =     0.2; //0.15; /// 0.2; //// 0.01; /// 0.1;    // pull vegetation to average of 4 neighbors (very small - maybe not needed)
+		double    terr_pull0 =    0.05; //0.03; ////// 0.05; ///// 0.1; //// 0.01; /// 0.2; /// 0.1;    //pull terrain to zero (makes sense with UM
+		double    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    boost_parallax = 3.0; /// 1.0; /////// 5.0; /// 1.0; //  5;
+		boolean   next_run =      false;
+		boolean   read_pars =     false; // true; /// false; /// true; //   false; // true;
 		double    threshold_terrain = 0.05;
 		double    min_max_terrain= 0.1;
 		double    min_terrain =    0.001;
@@ -705,7 +736,10 @@ public class VegetationModel {
 		//		String  parameters_path = "/media/elphel/SSD3-4GB/lwir16-proc/berdich3/debug/vegetation/essential/parameters_vector_data_1000-0.03.tiff";
 //		String  parameters_path = "/media/elphel/SSD3-4GB/lwir16-proc/berdich3/debug/vegetation/essential/parameters_vector_data_x143-y317-w35-h35-live_10000_0.02_3.0.tiff";
 //		String  parameters_path = "/media/elphel/SSD3-4GB/lwir16-proc/berdich3/debug/vegetation/essential/parameters_vector_data_x143-y317-w35-h35-al0.0-alo0.02-alp10.0-tl0.1-vl0.1-bp1.0-um1.0_0.8.tiff";
-		String  parameters_path = "/media/elphel/SSD3-4GB/lwir16-proc/berdich3/debug/vegetation/essential/parameters_vector_data_x143-y317-w35-h35-al10.0-alo0.0-alp10.0-tl0.1-vl0.1-bp1.0-um1.0_0.8-live.tiff";
+//		String  parameters_path = "/media/elphel/SSD3-4GB/lwir16-proc/berdich3/debug/vegetation/essential/parameters_vector_data_x143-y317-w35-h35-al10.0-alo0.0-alp10.0-tl0.1-vl0.1-bp1.0-um1.0_0.8-live.tiff";
+		String  parameters_path = "/media/elphel/SSD3-4GB/lwir16-proc/berdich3/debug/vegetation/essential/parameters_vector_data_x143-y317-w35-h35-al100.0-alo0.0-alp10.0-alin-tl0.2-vl0.01-tp0.01-vp0.01-bp5.0-um1.0_0.8.tiff";
+		
+				
 		if (um_en) {
 			double [][] um_data = new double [terrain_rendered.length+2][];
 			System.arraycopy(terrain_rendered, 0, um_data, 0, terrain_rendered.length);
@@ -785,14 +819,21 @@ public class VegetationModel {
 					default_alpha, // final double      default_alpha,
 					reg_weights,   // final double             reg_weights,        // fraction of the total weight used for regularization
 					alpha_loss,    // final double             alpha_loss,         // quadratic loss when alpha reaches -1.0 or 2.0 
-					alpha_offset,  // final double             alpha_offset,         // quadratic loss when alpha reaches -1.0 or 2.0
-					alpha_lpf,     // final double             alpha_lpf,           // pull to average of 4 neighbors
-					terr_lpf,      // final double             terr_lpf,       // pull terrain to average of 4 neighbors (very small)
-					veget_lpf,     // final double             veget_lpf,      // pull vegetation to average of 4 neighbors (very small - maybe not needed)
-					terr_pull0,     // final double             terr_pull0,     // pull terrain to zero (makes sense with UM
-					veget_pull0,    // final double             veget_pull0,    // pull vegetation to zero (makes sense with UM
-					boost_parallax,// final double             boost_parallax, // increase weight of scene with maximal parallax relative to the reference scene
-					um_sigma,      // final double             um_sigma,       // just use in debug image names
+					alpha_offset,  // final double             alpha_offset,       // quadratic loss when alpha reaches -1.0 or 2.0
+					alpha_lpf,     // final double             alpha_lpf,          // pull to average of 4 neighbors
+					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
+					alpha_push_neutral, // double    alpha_push_neutral = 0.8; // alpha point from which push (closer to opaque)
+					alpha_push_center,// final double             alpha_push_center,// 1.5; // weight of center alpha pixel relative to each of the 4 ortho ones
+					alpha_mm_hole,   //  double    alpha_mm_hole    = 0.1; // NaN to disable. Local "almost minimum" (lower than this fraction between min and max neighbor) is not subject to alpha_lpf
+
+					terr_lpf,      // final double             terr_lpf,           // pull terrain to average of 4 neighbors (very small)
+					veget_lpf,     // final double             veget_lpf,          // pull vegetation to average of 4 neighbors (very small - maybe not needed)
+					terr_pull0,     // final double             terr_pull0,        // pull terrain to zero (makes sense with UM
+					veget_pull0,    // final double             veget_pull0,       // pull vegetation to zero (makes sense with UM
+					boost_parallax,// final double             boost_parallax,     // increase weight of scene with maximal parallax relative to the reference scene
+					um_sigma,      // final double             um_sigma,           // just use in debug image names
 					(um_en? um_weight: 0.0),     // final double             um_weight,
 					par_path,       // final String             parameters_read_path, 
 					debugLevel);   // final int         debugLevel);
@@ -807,8 +848,6 @@ public class VegetationModel {
 						min_max_terrain, // double      min_max_terrain, //0.1
 						min_terrain,                         //double      min_terrain, //0.001
 						min_vegetation);                     // double      min_vegetation) { // 0.5				
-
-
 			}
 			next_run = true;
 			double  lambda =            5.0; // 0.1;