Change Erosion to use IterableLoopBuilder

Author: maarzt

src/main/java/net/imglib2/algorithm/morphology/Erosion.java

@@ -34,24 +34,23 @@
 package net.imglib2.algorithm.morphology;
 
 import java.util.List;
-import java.util.Vector;
+import java.util.function.BiConsumer;
 
-import net.imglib2.Cursor;
 import net.imglib2.FinalDimensions;
 import net.imglib2.Interval;
 import net.imglib2.IterableInterval;
-import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
+import net.imglib2.loops.IterableLoopBuilder;
 import net.imglib2.algorithm.neighborhood.Neighborhood;
 import net.imglib2.algorithm.neighborhood.Shape;
 import net.imglib2.img.Img;
 import net.imglib2.img.ImgFactory;
-import net.imglib2.multithreading.Chunk;
-import net.imglib2.multithreading.SimpleMultiThreading;
+import net.imglib2.parallel.Parallelization;
 import net.imglib2.type.Type;
 import net.imglib2.type.logic.BitType;
 import net.imglib2.type.numeric.RealType;
+import net.imglib2.util.Cast;
 import net.imglib2.util.Util;
 import net.imglib2.view.ExtendedRandomAccessibleInterval;
 import net.imglib2.view.IntervalView;
@@ -449,122 +448,38 @@ public static < T extends RealType< T >> void erode( final RandomAccessible< T >
 	 */
 	public static < T extends Type< T > & Comparable< T > > void erode( final RandomAccessible< T > source, final IterableInterval< T > target, final Shape strel, final T maxVal, int numThreads )
 	{
-		numThreads = Math.max( 1, numThreads );
-
-		/*
-		 * Prepare iteration.
-		 */
-
-		final RandomAccessible< Neighborhood< T >> accessible = strel.neighborhoodsRandomAccessible( source );
-
-		/*
-		 * Multithread
-		 */
-
-		final Vector< Chunk > chunks = SimpleMultiThreading.divideIntoChunks( target.size(), numThreads );
-		final Thread[] threads = SimpleMultiThreading.newThreads( numThreads );
-
-		final Object tmp = maxVal;
-		if ( tmp instanceof BitType )
-		{
-			/*
-			 * Optimization for BitType
-			 */
+		final RandomAccessible< Neighborhood< T >> neighborhoods = strel.neighborhoodsRandomAccessible( source );
+		Parallelization.runWithNumThreads( numThreads, () -> {
+			IterableLoopBuilder.setImages( target, neighborhoods ).multithreaded().forEachChunk( chunk -> {
+				chunk.forEachPixel( getErodeAction( maxVal ) );
+				return null;
+			} );
+		} );
+	}
 
-			for ( int i = 0; i < threads.length; i++ )
-			{
-				final Chunk chunk = chunks.get( i );
-				threads[ i ] = new Thread( "Morphology erode thread " + i )
-				{
-					@Override
-					public void run()
+	private static < T extends Type< T > & Comparable< T > > BiConsumer< T, Neighborhood< T > > getErodeAction( T maxVal )
+	{
+		if ( maxVal instanceof BitType )
+			return Cast.unchecked( ( BiConsumer< BitType, Neighborhood< BitType > > ) ( t, neighborhood ) -> {
+				for ( BitType val1 : neighborhood )
+					if ( ! val1.get() )
 					{
-						final RandomAccess< Neighborhood< T >> randomAccess = accessible.randomAccess( target );
-						final Object tmp2 = target.cursor();
-						@SuppressWarnings( "unchecked" )
-						final Cursor< BitType > cursorTarget = ( Cursor< BitType > ) tmp2;
-						cursorTarget.jumpFwd( chunk.getStartPosition() );
-
-						for ( long steps = 0; steps < chunk.getLoopSize(); steps++ )
-						{
-							cursorTarget.fwd();
-							randomAccess.setPosition( cursorTarget );
-							final Object tmp3 = randomAccess.get();
-							@SuppressWarnings( "unchecked" )
-							final Neighborhood< BitType > neighborhood = (net.imglib2.algorithm.neighborhood.Neighborhood< BitType > ) tmp3;
-							final Cursor< BitType > nc = neighborhood.cursor();
-
-							cursorTarget.get().set( true );
-							while ( nc.hasNext() )
-							{
-								nc.fwd();
-								final BitType val = nc.get();
-								if ( !val.get() )
-								{
-									cursorTarget.get().set( false );
-									break;
-								}
-							}
-						}
-
+						t.set( false );
+						return;
 					}
-				};
-			}
-		}
+				t.set( true );
+			} );
 		else
 		{
-			/*
-			 * All other comparable type.
-			 */
-
-			for ( int i = 0; i < threads.length; i++ )
-			{
-				final Chunk chunk = chunks.get( i );
-				threads[ i ] = new Thread( "Morphology erode thread " + i )
-				{
-					@Override
-					public void run()
-					{
-						final RandomAccess< Neighborhood< T >> randomAccess = accessible.randomAccess( target );
-						final Cursor< T > cursorTarget = target.cursor();
-						cursorTarget.jumpFwd( chunk.getStartPosition() );
-
-						final T max = MorphologyUtils.createVariable( source, target );
-						for ( long steps = 0; steps < chunk.getLoopSize(); steps++ )
-						{
-							cursorTarget.fwd();
-							randomAccess.setPosition( cursorTarget );
-							final Neighborhood< T > neighborhood = randomAccess.get();
-							final Cursor< T > nc = neighborhood.cursor();
-
-							/*
-							 * Look for max in the neighborhood.
-							 */
-
-							max.set( maxVal );
-							while ( nc.hasNext() )
-							{
-								nc.fwd();
-								final T val = nc.get();
-								// We need only Comparable to do this:
-								if ( val.compareTo( max ) < 0 )
-								{
-									max.set( val );
-								}
-							}
-							cursorTarget.get().set( max );
-						}
-
-					}
-				};
-			}
+			T min = maxVal.copy();
+			return ( t, neighborhood ) -> {
+				min.set( maxVal );
+				for ( T val : neighborhood )
+					if ( val.compareTo( min ) < 0 )
+						min.set( val );
+				t.set( min );
+			};
 		}
-
-		/*
-		 * Launch calculation
-		 */
-
-		SimpleMultiThreading.startAndJoin( threads );
 	}
 
 	/**