Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
imagej-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
imagej-elphel
Commits
3ead1b3d
Commit
3ead1b3d
authored
May 26, 2017
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moving plane fitness to each other to a separate class
parent
86e21078
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
356 additions
and
14 deletions
+356
-14
LinkPlanes.java
src/main/java/LinkPlanes.java
+342
-0
SuperTiles.java
src/main/java/SuperTiles.java
+5
-5
TileSurface.java
src/main/java/TileSurface.java
+9
-9
No files found.
src/main/java/LinkPlanes.java
0 → 100644
View file @
3ead1b3d
This diff is collapsed.
Click to expand it.
src/main/java/SuperTiles.java
View file @
3ead1b3d
...
@@ -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)
...
...
src/main/java/TileSurface.java
View file @
3ead1b3d
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 - ha
n
dle 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment