Commit a8718162 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

Working snapshot, good logs

parent 5a10b665

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

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ public class VegetationLMA { 
	// when unsharp mask is applied , pulling to 0 (when alpha is 0 (for vegetation) or 1.0 (for terrain) makes sense

	private double             terr_pull0 =      0; // now - pull to filled terrain - terrain_average

	private double             veget_pull0 =     0; // now - pull to vegetation_pull (extended vegetation)

	private double             elevation_pull0 = 0; // now - pull to initial elevation

	public  double             elevation_pull0 = 0; // now - pull to initial elevation

	private double             scenes_pull0 =    0; // pull average scene offset to 0;

	private boolean            use_scenes_pull0 = true; // derivative, set in setWeights

//	private boolean            use_y_avg =        true; // derivative, set in setWeights
@@ -871,7 +871,7 @@ public class VegetationLMA { 
			}

			if (debug_level > -2) { // 1) {

				System.out.println((new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(Calendar.getInstance().getTime()))+

						" LMA step"+String.format("%3d",iter)+": {"+rslt[0]+","+rslt[1]+"} full RMS= "+good_or_bad_rms[0]+

						" LMA step"+String.format("%3d (of%3d)",iter,num_iter)+": {"+rslt[0]+","+rslt[1]+"} full RMS= "+good_or_bad_rms[0]+

						" ("+initial_rms[0]+"), pure RMS="+good_or_bad_rms[1]+" ("+initial_rms[1]+") + lambda="+lambda);

			}

			if (rslt[1]) {

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

+18 −0
Original line number Diff line number Diff line
@@ -2027,6 +2027,24 @@ public class VegetationModel { 
			vegetationLMA.debug_image = new double [100][]; // num_iter][];



			int lma_rslt= vegetationLMA.runLma( // <0 - failed, >=0 iteration number (1 - immediately)

					lambda,           // double lambda,           // 0.1

					lambda_scale_good,// double lambda_scale_good,// 0.5

					lambda_scale_bad, // double lambda_scale_bad, // 8.0

					lambda_max,       // double lambda_max,       // 100

					rms_diff,         // double rms_diff,         // 0.001

					15, // num_iter,         //int    num_iter,         // 20

					last_run,         // boolean last_run,

					null,             // String dbg_prefix,

					debugLevel);      // int    debug_level)

	  		if (debugLevel > -2) { // 1) {

				System.out.println((new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(Calendar.getInstance().getTime()))+

						" LMA finished");

			}

	  		

	  		elev_pull0 *= 0.01;

	  		vegetationLMA.elevation_pull0 = elev_pull0;

	  		

			lma_rslt= vegetationLMA.runLma( // <0 - failed, >=0 iteration number (1 - immediately)

					lambda,           // double lambda,           // 0.1

					lambda_scale_good,// double lambda_scale_good,// 0.5

					lambda_scale_bad, // double lambda_scale_bad, // 8.0