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
9b725244
Commit
9b725244
authored
Jun 18, 2017
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
before removing old versions
parent
9b8a5082
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1418 additions
and
674 deletions
+1418
-674
LinkPlanes.java
src/main/java/LinkPlanes.java
+965
-281
SuperTiles.java
src/main/java/SuperTiles.java
+74
-43
TilePlanes.java
src/main/java/TilePlanes.java
+1
-1
TileProcessor.java
src/main/java/TileProcessor.java
+373
-346
TileSurface.java
src/main/java/TileSurface.java
+5
-3
No files found.
src/main/java/LinkPlanes.java
View file @
9b725244
This diff is collapsed.
Click to expand it.
src/main/java/SuperTiles.java
View file @
9b725244
This diff is collapsed.
Click to expand it.
src/main/java/TilePlanes.java
View file @
9b725244
...
@@ -4969,7 +4969,7 @@ public class TilePlanes {
...
@@ -4969,7 +4969,7 @@ public class TilePlanes {
}
}
}
}
if
(((
debugLevel
>
-
1
)
&&
((
debugLevel
>
0
)
||
(
max_attr_corr
>
attractionCorrMax
))
)&&
(
num_planes
>
1
)){
if
(((
debugLevel
>
0
)
&&
((
debugLevel
>
1
)
||
(
max_attr_corr
>
attractionCorrMax
))
)&&
(
num_planes
>
1
)){
String
dbg_s
=
"refineDiscriminateTiles() plane attraction correlation for "
+
prefix
+
": maximal="
+
max_attr_corr
;
String
dbg_s
=
"refineDiscriminateTiles() plane attraction correlation for "
+
prefix
+
": maximal="
+
max_attr_corr
;
for
(
int
np
=
0
;
np
<
num_planes
;
np
++)
{
for
(
int
np
=
0
;
np
<
num_planes
;
np
++)
{
for
(
int
np1
=
np
+
1
;
np1
<
num_planes
;
np1
++)
{
for
(
int
np1
=
np
+
1
;
np1
<
num_planes
;
np1
++)
{
...
...
src/main/java/TileProcessor.java
View file @
9b725244
This diff is collapsed.
Click to expand it.
src/main/java/TileSurface.java
View file @
9b725244
...
@@ -416,7 +416,8 @@ public class TileSurface {
...
@@ -416,7 +416,8 @@ public class TileSurface {
final
int
nStiles
=
stilesX
*
stilesY
;
final
int
nStiles
=
stilesX
*
stilesY
;
final
int
nTiles
=
nStiles
*
superTileSize
*
superTileSize
;
final
int
nTiles
=
nStiles
*
superTileSize
*
superTileSize
;
final
double
[][][][]
fused_data
=
new
double
[
nStiles
][][][];
final
double
[][][][]
fused_data
=
new
double
[
nStiles
][][][];
final
Thread
[]
threads
=
ImageDtt
.
newThreadArray
(
threadsMax
);
// final Thread[] threads = ImageDtt.newThreadArray(threadsMax);
final
Thread
[]
threads
=
ImageDtt
.
newThreadArray
((
debugLevel
>
1
)?
1
:
threadsMax
);
final
AtomicInteger
ai
=
new
AtomicInteger
(
0
);
final
AtomicInteger
ai
=
new
AtomicInteger
(
0
);
final
int
dbg_tile
=
dbg_Y
*
stilesX
+
dbg_X
;
final
int
dbg_tile
=
dbg_Y
*
stilesX
+
dbg_X
;
for
(
int
ithread
=
0
;
ithread
<
threads
.
length
;
ithread
++)
{
for
(
int
ithread
=
0
;
ithread
<
threads
.
length
;
ithread
++)
{
...
@@ -424,7 +425,8 @@ public class TileSurface {
...
@@ -424,7 +425,8 @@ public class TileSurface {
public
void
run
()
{
public
void
run
()
{
for
(
int
nsTile
=
ai
.
getAndIncrement
();
nsTile
<
nStiles
;
nsTile
=
ai
.
getAndIncrement
())
{
for
(
int
nsTile
=
ai
.
getAndIncrement
();
nsTile
<
nStiles
;
nsTile
=
ai
.
getAndIncrement
())
{
if
(
planes
[
nsTile
]
!=
null
)
{
if
(
planes
[
nsTile
]
!=
null
)
{
int
dl
=
((
debugLevel
>
-
1
)
&&
(
nsTile
==
dbg_tile
))
?
3
:
0
;
// int dl = ((debugLevel > -1) && (nsTile == dbg_tile)) ? 3:0;
int
dl
=
((
debugLevel
>
1
)
&&
(
nsTile
==
dbg_tile
))
?
3
:
debugLevel
;
if
(
dl
>
0
){
if
(
dl
>
0
){
System
.
out
.
println
(
"fuseSupertilePlanes(), nsTile = "
+
nsTile
);
System
.
out
.
println
(
"fuseSupertilePlanes(), nsTile = "
+
nsTile
);
}
}
...
@@ -495,7 +497,7 @@ public class TileSurface {
...
@@ -495,7 +497,7 @@ public class TileSurface {
}
}
}
}
fused_data
[
nsTile
]
=
disp_strength
;
fused_data
[
nsTile
]
=
disp_strength
;
if
((
debugLevel
>
-
1
)
&&
(
dl
>
0
)){
if
((
debugLevel
>
-
1
)
&&
(
dl
>
0
)){
String
[]
titles
=
new
String
[
3
*
disp_strength
.
length
];
String
[]
titles
=
new
String
[
3
*
disp_strength
.
length
];
double
[][]
dbg_img
=
new
double
[
titles
.
length
][];
double
[][]
dbg_img
=
new
double
[
titles
.
length
][];
for
(
int
i
=
0
;
i
<
disp_strength
.
length
;
i
++)
{
for
(
int
i
=
0
;
i
<
disp_strength
.
length
;
i
++)
{
...
...
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