-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BlockSolver does not need an instance of R, test that it should work …
…with intensities
- Loading branch information
1 parent
a140723
commit 35b3e0b
Showing
7 changed files
with
119 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
...-java-client/src/main/java/org/janelia/render/client/newsolver/assembly/ZBlockFusion.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package org.janelia.render.client.newsolver.assembly; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.janelia.render.client.newsolver.BlockData; | ||
| import org.janelia.render.client.newsolver.blockfactories.ZBlockFactory; | ||
|
|
||
| public class ZBlockFusion< Z, G, R > implements BlockFusion< Z, G, R, ZBlockFactory > | ||
| { | ||
|
|
||
| @Override | ||
| public void globalFusion(List<? extends BlockData<?, R, ?, ZBlockFactory>> blocks, AssemblyMaps<Z> am) { | ||
| // TODO Auto-generated method stub | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
...janelia/render/client/newsolver/assembly/matches/SameTileMatchCreatorAffineIntensity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package org.janelia.render.client.newsolver.assembly.matches; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.janelia.alignment.spec.TileSpec; | ||
|
|
||
| import mpicbg.models.Affine2D; | ||
| import mpicbg.models.AffineModel1D; | ||
| import mpicbg.models.Point; | ||
| import mpicbg.models.PointMatch; | ||
|
|
||
| public class SameTileMatchCreatorAffineIntensity implements SameTileMatchCreator< List< AffineModel1D > > | ||
| { | ||
| final int samplesPerDimension; | ||
|
|
||
| public SameTileMatchCreatorAffineIntensity( final int samplesPerDimension ) | ||
| { | ||
| this.samplesPerDimension = samplesPerDimension; | ||
| } | ||
|
|
||
| public SameTileMatchCreatorAffineIntensity() { this( 2 ); } | ||
|
|
||
| @Override | ||
| public void addMatches(TileSpec tileSpec, List< AffineModel1D > modelA, List< AffineModel1D > modelB, List<PointMatch> matchesAtoB) | ||
| { | ||
| // TODO: make 64 matches that map A to p and B to q | ||
|
|
||
| /* | ||
| // make a regular grid | ||
| final double sampleWidth = (tileSpec.getWidth() - 1.0) / (samplesPerDimension - 1.0); | ||
| final double sampleHeight = (tileSpec.getHeight() - 1.0) / (samplesPerDimension - 1.0); | ||
| for (int y = 0; y < samplesPerDimension; ++y) | ||
| { | ||
| final double sampleY = y * sampleHeight; | ||
| for (int x = 0; x < samplesPerDimension; ++x) | ||
| { | ||
| final double[] p = new double[] { x * sampleWidth, sampleY }; | ||
| final double[] q = new double[] { x * sampleWidth, sampleY }; | ||
| modelA.applyInPlace( p ); | ||
| modelB.applyInPlace( q ); | ||
| matchesAtoB.add(new PointMatch( new Point(p), new Point(q) )); | ||
| } | ||
| } | ||
| */ | ||
| } | ||
|
|
||
| } |