refactoring (d152fbaa) · Commits · Elphel / imagej-elphel

src/main/java/com/elphel/imagej/tileprocessor/IntersceneMatchParameters.java

+74 −22

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

+18 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1512,7 +1512,7 @@ public class VegetationLMA {
	for (int n = 0; n < 4; n++) {		for (int n = 0; n < 4; n++) {
	for (int i = 0; (i < indices[n].length) && (i < par_index[n].length); i++) {		for (int i = 0; (i < indices[n].length) && (i < par_index[n].length); i++) {
	int indx = i;		int indx = i;
	if (n < 3) {		if (n < TVAO_SCENE_OFFSET) {
	int w = i % woi.width;		int w = i % woi.width;
	int h = i / woi.width;		int h = i / woi.width;
	indx = (h + woi.y) * full.width + (w + woi.x);		indx = (h + woi.y) * full.width + (w + woi.x);
	@@ -1520,7 +1520,11 @@ public class VegetationLMA {
	int pindx = par_index[n][indx];		int pindx = par_index[n][indx];
	indices[n][i] = pindx;		indices[n][i] = pindx;
	if (pindx < 0) {		if (pindx < 0) {
			if (n == TVAO_SCENE_OFFSET) {
			data[n][i] = Double.NaN;
			} else {
	data[n][i] = tvao[n][indx];		data[n][i] = tvao[n][indx];
			}
	} else {		} else {
	data[n][i] = vector[pindx];		data[n][i] = vector[pindx];
	}		}
	@@ -1644,9 +1648,17 @@ public class VegetationLMA {
	}		}
	}		}
	// Trim data to actiual		// Trim data to actiual
	int num_pars_scenes = Integer.parseInt((String) imp_pars.getProperty("NUM_PARS_SCENES"));		// int num_pars_scenes = Integer.parseInt((String) imp_pars.getProperty("NUM_PARS_SCENES"));
	double [] scene_offsets = new double [num_pars_scenes];		// double [] scene_offsets = new double [num_pars_scenes];
	System.arraycopy(data[3], 0, scene_offsets, 0, num_pars_scenes);		double [] scene_offsets = new double [num_scenes];
			System.arraycopy(data[TVAO_SCENE_OFFSET], 0, scene_offsets, 0, scene_offsets.length);
			// temporary patch, later they will be NaNs already - Already done !
			for (int i = 0; i < scene_offsets.length; i++) {
			if (indices[TVAO_SCENE_OFFSET][i] < 0) {
			data[TVAO_SCENE_OFFSET][i] = Double.NaN;
			}
			}

	for (int n = 0; n < 3; n++) {		for (int n = 0; n < 3; n++) {
	if (woi.width * woi.height < data[n].length ) {		if (woi.width * woi.height < data[n].length ) {
	double [] d = new double [woi.width * woi.height];		double [] d = new double [woi.width * woi.height];
	@@ -1655,8 +1667,6 @@ public class VegetationLMA {
	}		}
	}		}
	data[3] = scene_offsets;		data[3] = scene_offsets;


	} else {		} else {
	this.woi = woi;		this.woi = woi;
	diff_offsets = Boolean.parseBoolean((String) imp_pars.getProperty("DIFF_OFFSETS"));		diff_offsets = Boolean.parseBoolean((String) imp_pars.getProperty("DIFF_OFFSETS"));
	@@ -2030,7 +2040,7 @@ public class VegetationLMA {
	woi); // Rectangle file_woi)		woi); // Rectangle file_woi)
	segments[n] = new VegetationSegment(		segments[n] = new VegetationSegment(
	woi, // Rectangle woi,		woi, // Rectangle woi,
	tvao[3], // datadouble [] scene_offsets,		tvao[TVAO_SCENE_OFFSET], // datadouble [] scene_offsets,
	new double [][] {tvao[0],tvao[1],tvao[2]}); // double [][] tva) {} {}		new double [][] {tvao[0],tvao[1],tvao[2]}); // double [][] tva) {} {}
	}		}
	// sort in line-scan order		// sort in line-scan order

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

+85 −61

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ public class VegetationSegment {
	public double [][] tva;		public double [][] tva;
	public VegetationSegment(		public VegetationSegment(
	Rectangle woi,		Rectangle woi,
	double [] scene_offsets,		double [] scene_offsets, // has NaNs
	double [][] tva) {		double [][] tva) {
	this.woi = woi;		this.woi = woi;
	this.scene_offsets = scene_offsets;		this.scene_offsets = scene_offsets;

Original line number	Original line	Diff line number	Diff line
	@@ -720,10 +720,12 @@ min_str_neib_fpn 0.35
	public Color annotate_color_mono = new Color( 255, 180, 50); // reddish over grey		public Color annotate_color_mono = new Color( 255, 180, 50); // reddish over grey
	public boolean annotate_transparent_mono = false; // // black if not transparent		public boolean annotate_transparent_mono = false; // // black if not transparent

	// terrain parameters		// terrain/vegetation parameters
	public boolean terr_um_en = true;		public boolean terr_um_en = true;
	public double terr_um_sigma = 1.0;		public double terr_um_sigma = 1.0;
	public double terr_um_weight = 0.8;		public double terr_um_weight = 0.8;
			public double terr_nan_tolerance = 0.001; // set undefined terrain (out of capture area) to nan, it is almost zero after UM
			public int terr_nan_grow = 20; // grow undefined terrain after detection

	public boolean terr_tile_woi = true; // if false - use woi50;		public boolean terr_tile_woi = true; // if false - use woi50;
	public Rectangle terr_woi_enclos = new Rectangle(80, 210, 210, 230); // will be tiled, using width/height from woi_step;		public Rectangle terr_woi_enclos = new Rectangle(80, 210, 210, 230); // will be tiled, using width/height from woi_step;
	@@ -733,6 +735,10 @@ min_str_neib_fpn 0.35
	public boolean terr_continue= false; // start from last/single		public boolean terr_continue= false; // start from last/single

	public int terr_min_scenes = 1; // minimal number of scenes (inside woi) vegetation pixel must influence		public int terr_min_scenes = 1; // minimal number of scenes (inside woi) vegetation pixel must influence
			public int terr_min_samples_scene = 10;
			public int terr_min_total_scenes = 2;
			public int terr_min_pixels = 10;

	public double terr_alpha_dflt = 0.5;		public double terr_alpha_dflt = 0.5;
	public double terr_alpha_loss = 100.0;		public double terr_alpha_loss = 100.0;
	public double terr_alpha_offset = 0.0;		public double terr_alpha_offset = 0.0;
	@@ -750,6 +756,7 @@ min_str_neib_fpn 0.35

	// LMA parameters		// LMA parameters
	public double terr_boost_parallax = 3.0; //		public double terr_boost_parallax = 3.0; //
			public double terr_max_parallax = 10.0; // parallax limit when evaluating boost parallax
	public double terr_reg_weights = 0.25; // fraction of the total weight used for regularization		public double terr_reg_weights = 0.25; // fraction of the total weight used for regularization
	public double terr_lambda = 5.0; //		public double terr_lambda = 5.0; //
	public double terr_lambda_scale_good = 0.5;		public double terr_lambda_scale_good = 0.5;
	@@ -765,6 +772,9 @@ min_str_neib_fpn 0.35
	public double terr_alpha_min = 0.1; // below - completely transparent vegetation		public double terr_alpha_min = 0.1; // below - completely transparent vegetation
	public double terr_alpha_max = 0.8; // above - completely opaque		public double terr_alpha_max = 0.8; // above - completely opaque
	public double terr_weight_opaque = 0.02; // render through completely opaque vegetation		public double terr_weight_opaque = 0.02; // render through completely opaque vegetation
			public double terr_boost_render = 3.0; // boost parallax during render
			public double terr_max_render = 10.0; // maximal parallax during render

	public int terr_num_exaggerate = 3; // generate exagerrated rendering		public int terr_num_exaggerate = 3; // generate exagerrated rendering

Admin message