Commit 88e3bc5d authored by Andrey Filippov's avatar Andrey Filippov

working on initial z-map generation

parent 8d62abba
...@@ -1219,6 +1219,7 @@ public class AlignmentCorrection { ...@@ -1219,6 +1219,7 @@ public class AlignmentCorrection {
} }
return disp_strength; return disp_strength;
} }
public double[][] filterDisparityStrength ( public double[][] filterDisparityStrength (
final double[][] disp_strength_in, final double[][] disp_strength_in,
final double strength_floor, final double strength_floor,
...@@ -1362,6 +1363,13 @@ public class AlignmentCorrection { ...@@ -1362,6 +1363,13 @@ public class AlignmentCorrection {
} }
return disp_strength; return disp_strength;
} }
public void show_fine_corr( public void show_fine_corr(
double [][][] corr, double [][][] corr,
String prefix) String prefix)
......
...@@ -74,7 +74,10 @@ public class CLTPass3d{ ...@@ -74,7 +74,10 @@ public class CLTPass3d{
{ {
return texture_tiles; return texture_tiles;
} }
public double [][] getMaxTriedDisparity()
{
return max_tried_disparity;
}
public double [][] getTileRBGA( public double [][] getTileRBGA(
int num_layers) int num_layers)
{ {
...@@ -744,6 +747,9 @@ public class CLTPass3d{ ...@@ -744,6 +747,9 @@ public class CLTPass3d{
return untested_bgnd; return untested_bgnd;
} }
public SuperTiles getSuperTiles() public SuperTiles getSuperTiles()
...@@ -764,6 +770,7 @@ public class CLTPass3d{ ...@@ -764,6 +770,7 @@ public class CLTPass3d{
int smplSide, // = 2; // Sample size (side of a square) int smplSide, // = 2; // Sample size (side of a square)
int smplNum, // = 3; // Number after removing worst int smplNum, // = 3; // Number after removing worst
double smplRms, // = 0.1; // Maximal RMS of the remaining tiles in a sample double smplRms, // = 0.1; // Maximal RMS of the remaining tiles in a sample
boolean smplWnd, // use window functions for the samples
int measSel) int measSel)
{ {
this.superTiles = new SuperTiles( this.superTiles = new SuperTiles(
...@@ -780,6 +787,7 @@ public class CLTPass3d{ ...@@ -780,6 +787,7 @@ public class CLTPass3d{
smplSide, // = 2; // Sample size (side of a square) smplSide, // = 2; // Sample size (side of a square)
smplNum, // = 3; // Number after removing worst smplNum, // = 3; // Number after removing worst
smplRms, // = 0.1; // Maximal RMS of the remaining tiles in a sample smplRms, // = 0.1; // Maximal RMS of the remaining tiles in a sample
smplWnd, // final boolean smplWnd, // use window functions for the samples
measSel); measSel);
return this.superTiles; return this.superTiles;
} }
...@@ -791,6 +799,7 @@ public class CLTPass3d{ ...@@ -791,6 +799,7 @@ public class CLTPass3d{
int smplSide, // = 2; // Sample size (side of a square) int smplSide, // = 2; // Sample size (side of a square)
int smplNum, // = 3; // Number after removing worst int smplNum, // = 3; // Number after removing worst
double smplRms, // = 0.1; // Maximal RMS of the remaining tiles in a sample double smplRms, // = 0.1; // Maximal RMS of the remaining tiles in a sample
boolean smplWnd, // use window functions for the samples
int measSel) int measSel)
{ {
if (this.superTiles == null){ if (this.superTiles == null){
...@@ -804,6 +813,7 @@ public class CLTPass3d{ ...@@ -804,6 +813,7 @@ public class CLTPass3d{
smplSide, // = 2; // Sample size (side of a square) smplSide, // = 2; // Sample size (side of a square)
smplNum, // = 3; // Number after removing worst smplNum, // = 3; // Number after removing worst
smplRms, // = 0.1; // Maximal RMS of the remaining tiles in a sample smplRms, // = 0.1; // Maximal RMS of the remaining tiles in a sample
smplWnd, // use window functions for the samples
measSel); measSel);
} }
......
...@@ -529,7 +529,8 @@ public class ConnectionCosts { ...@@ -529,7 +529,8 @@ public class ConnectionCosts {
conn_weight += 1.0; conn_weight += 1.0;
} }
} }
double [] value_weight = {merged_plane.getValue(),merged_plane.getWeight(),conn_weight}; // double [] value_weight = {merged_plane.getValue(),merged_plane.getWeight(),conn_weight};
double [] value_weight = {merged_plane.getNormValue(),merged_plane.getWeight(),conn_weight};
if (starPwr != 0){ if (starPwr != 0){
value_weight[0] /= (Math.pow((planes[nsTile][nl].getNumNeibBest() + 1.0), starPwr)); value_weight[0] /= (Math.pow((planes[nsTile][nl].getNumNeibBest() + 1.0), starPwr));
} }
...@@ -638,7 +639,8 @@ public class ConnectionCosts { ...@@ -638,7 +639,8 @@ public class ConnectionCosts {
conn_weight += entry.getValue(); conn_weight += entry.getValue();
} }
double [] value_weight = {merged_plane.getValue(),merged_plane.getWeight(),conn_weight}; // double [] value_weight = {merged_plane.getValue(),merged_plane.getWeight(),conn_weight};
double [] value_weight = {merged_plane.getNormValue(),merged_plane.getWeight(),conn_weight};
if (starPwr != 0){ if (starPwr != 0){
value_weight[0] /= (Math.pow(tile_weights.size() + 1.0, starPwr)); value_weight[0] /= (Math.pow(tile_weights.size() + 1.0, starPwr));
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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