Commit 3ead1b3d authored by Andrey Filippov's avatar Andrey Filippov

moving plane fitness to each other to a separate class

parent 86e21078
This diff is collapsed.
...@@ -6498,9 +6498,9 @@ public class SuperTiles{ ...@@ -6498,9 +6498,9 @@ public class SuperTiles{
double this_rq_norm = this_rq; double this_rq_norm = this_rq;
if ((w1 + w2) < weakWorsening) this_rq_norm *= (w1 + w2) / weakWorsening; // forgive more for weak planes if ((w1 + w2) < weakWorsening) this_rq_norm *= (w1 + w2) / weakWorsening; // forgive more for weak planes
double this_rq_eq = mergeRQuality( double this_rq_eq = mergeRQuality(
planes[nsTile0][np0].getValue() + eigenFloor, // double L1, planes[nsTile0][np0].getValue(), // double L1,
planes[nsTile][np].getValue() + eigenFloor, // double L2, planes[nsTile][np].getValue(), // double L2,
merge_ev[np], // double L, merge_ev_eq[np], // double L,
1.0, // double w1, 1.0, // double w1,
1.0, // double w2) 1.0, // double w2)
eigenFloor);// double eigen_floor) eigenFloor);// double eigen_floor)
...@@ -6763,8 +6763,8 @@ public class SuperTiles{ ...@@ -6763,8 +6763,8 @@ public class SuperTiles{
double this_rq_norm = this_rq; double this_rq_norm = this_rq;
if ((w1 + w2) < weakWorsening) this_rq_norm *= (w1 + w2) / weakWorsening; // forgive more for weak planes if ((w1 + w2) < weakWorsening) this_rq_norm *= (w1 + w2) / weakWorsening; // forgive more for weak planes
double this_rq_eq = mergeRQuality( double this_rq_eq = mergeRQuality(
planes[nsTile][np1].getValue() + eigenFloor, // double L1, planes[nsTile][np1].getValue(), // double L1,
planes[nsTile][np2].getValue() + eigenFloor, // double L2, planes[nsTile][np2].getValue(), // double L2,
merged_pd_eq.getValue(), // double L, merged_pd_eq.getValue(), // double L,
1.0, // double w1, 1.0, // double w1,
1.0, // double w2) 1.0, // double w2)
......
import java.awt.Point;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.concurrent.atomic.AtomicInteger;
/** /**
** **
** TileSurface - hadle tile surfaces ** TileSurface - handle tile surfaces
** **
** Copyright (C) 2017 Elphel, Inc. ** Copyright (C) 2017 Elphel, Inc.
** **
...@@ -29,6 +21,14 @@ import java.util.concurrent.atomic.AtomicInteger; ...@@ -29,6 +21,14 @@ import java.util.concurrent.atomic.AtomicInteger;
** -----------------------------------------------------------------------------** ** -----------------------------------------------------------------------------**
** **
*/ */
import java.awt.Point;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.concurrent.atomic.AtomicInteger;
public class TileSurface { public class TileSurface {
// public // public
......
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