Skip to content
Snippets Groups Projects

Dev bug fix

Merged Céline TREBEAU requested to merge dev-bug-fix into dev
3 files
+ 14
40
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -2,11 +2,9 @@ package fr.pasteur.ida.zellige;
@@ -2,11 +2,9 @@ package fr.pasteur.ida.zellige;
import fr.pasteur.ida.zellige.exception.EmptyOutputException;
import fr.pasteur.ida.zellige.exception.EmptyOutputException;
import fr.pasteur.ida.zellige.exception.NoClassificationException;
import fr.pasteur.ida.zellige.exception.NoClassificationException;
import fr.pasteur.ida.zellige.jzy3D.LocalMaximumsDisplay;
import fr.pasteur.ida.zellige.jzy3D.SurfaceDisplay;
import fr.pasteur.ida.zellige.jzy3D.SurfaceDisplay;
import fr.pasteur.ida.zellige.surfaceConstruction.construction.constructionRound.FirstRoundConstruction;
import fr.pasteur.ida.zellige.surfaceConstruction.construction.constructionRound.FirstRoundConstruction;
import fr.pasteur.ida.zellige.surfaceConstruction.construction.constructionRound.SecondRoundConstruction;
import fr.pasteur.ida.zellige.surfaceConstruction.construction.constructionRound.SecondRoundConstruction;
import fr.pasteur.ida.zellige.surfaceConstruction.construction.maximumSelection.Pretreatment;
import fr.pasteur.ida.zellige.surfaceConstruction.construction.maximumSelection.SurfacePixelSelection;
import fr.pasteur.ida.zellige.surfaceConstruction.construction.maximumSelection.SurfacePixelSelection;
import fr.pasteur.ida.zellige.surfaceConstruction.element.Pixels;
import fr.pasteur.ida.zellige.surfaceConstruction.element.Pixels;
import fr.pasteur.ida.zellige.surfaceConstruction.element.ReferenceSurface;
import fr.pasteur.ida.zellige.surfaceConstruction.element.ReferenceSurface;
@@ -71,10 +69,10 @@ public class ReferenceSurfaceExtraction< T extends RealType< T > & NativeType< T
@@ -71,10 +69,10 @@ public class ReferenceSurfaceExtraction< T extends RealType< T > & NativeType< T
/* First round construction*/
/* First round construction*/
ArrayList< Surface > tempSurfaces = FirstRoundConstruction.run( maximums, constructionParameters[0] );
ArrayList< Surface > tempSurfaces = FirstRoundConstruction.run( maximums, constructionParameters[0] );
System.out.println( "first round surfaces = " + tempSurfaces.size() );
System.out.println( "first round surfaces = " + tempSurfaces.size() );
// for(Surface s : tempSurfaces)
for(Surface s : tempSurfaces)
// {
{
// displaySurface( s );
displaySurface( s );
// }
}
/* Second round construction */
/* Second round construction */
ArrayList<Surface> finalSurfaces = SecondRoundConstruction.run( tempSurfaces, constructionParameters[1] );
ArrayList<Surface> finalSurfaces = SecondRoundConstruction.run( tempSurfaces, constructionParameters[1] );
@@ -86,31 +84,6 @@ public class ReferenceSurfaceExtraction< T extends RealType< T > & NativeType< T
@@ -86,31 +84,6 @@ public class ReferenceSurfaceExtraction< T extends RealType< T > & NativeType< T
e.printStackTrace();
e.printStackTrace();
}
}
}
}
public void extract( ) throws EmptyOutputException, NoClassificationException
{
// select();
construct();
// /* Second step : Surface construction in 2 rounds */
// try
// {
// /* First round construction*/
// ArrayList< Surface > tempSurfaces = FirstRoundConstruction.run( maximums, constructionParameters[0] );
// System.out.println( "first round surfaces = " + tempSurfaces.size() );
//// for(Surface s : tempSurfaces)
//// {
//// displaySurface( s );
//// }
// /* Second round construction */
// ArrayList<Surface> finalSurfaces = SecondRoundConstruction.run( tempSurfaces, constructionParameters[1] );
//
// /* Building reference surfaces */
// referenceSurfaceInstantiation( finalSurfaces );
// }
// catch ( Exception e )
// {
// e.printStackTrace();
// }
}
public Img<UnsignedShortType> processedZMap(Surface surface)
public Img<UnsignedShortType> processedZMap(Surface surface)
{
{
Loading