Make ComputationType global

Author: tpietzsch

src/main/java/net/imglib2/algorithm/blocks/ComputationType.java

@@ -0,0 +1,12 @@
+package net.imglib2.algorithm.blocks;
+
+/**
+ * Specify in which precision should intermediate values be computed. (For
+ * {@code AUTO}, the type that can represent the input/output type without
+ * loss of precision is picked. That is, {@code FLOAT} for u8, i8, u16, i16,
+ * i32, f32, and otherwise {@code DOUBLE} for u32, i64, f64.
+ */
+public enum ComputationType
+{
+	FLOAT, DOUBLE, AUTO
+}

src/main/java/net/imglib2/algorithm/blocks/downsample/Downsample.java

@@ -38,6 +38,7 @@
 
 import net.imglib2.algorithm.blocks.BlockSupplier;
 import net.imglib2.algorithm.blocks.ClampType;
+import net.imglib2.algorithm.blocks.ComputationType;
 import net.imglib2.algorithm.blocks.downsample.DownsampleBlockProcessors.CenterDouble;
 import net.imglib2.algorithm.blocks.downsample.DownsampleBlockProcessors.CenterFloat;
 import net.imglib2.algorithm.blocks.downsample.DownsampleBlockProcessors.HalfPixelDouble;
@@ -151,17 +152,6 @@ public static long[] getDownsampledDimensions( final long[] imgDimensions, final
 		return destSize;
 	}
 
-	/**
-	 * Specify in which precision should intermediate values be computed. (For
-	 * {@code AUTO}, the type that can represent the input/output type without
-	 * loss of precision is picked. That is, {@code FLOAT} for u8, i8, u16, i16,
-	 * i32, f32, and otherwise {@code DOUBLE} for u32, i64, f64.
-	 */
-	public enum ComputationType
-	{
-		FLOAT, DOUBLE, AUTO
-	}
-
 	/**
 	 * Specify where downsampled pixels should be placed.
 	 */

src/main/java/net/imglib2/algorithm/blocks/transform/Transform.java

@@ -37,6 +37,7 @@
 import net.imglib2.algorithm.blocks.DefaultUnaryBlockOperator;
 import net.imglib2.algorithm.blocks.UnaryBlockOperator;
 import net.imglib2.algorithm.blocks.ClampType;
+import net.imglib2.algorithm.blocks.ComputationType;
 import net.imglib2.realtransform.AffineGet;
 import net.imglib2.realtransform.AffineTransform2D;
 import net.imglib2.realtransform.AffineTransform3D;
@@ -54,16 +55,6 @@
  */
 public class Transform
 {
-	/**
-	 * Specify in which precision should intermediate values be computed. (For
-	 * {@code AUTO}, the type that can represent the input/output type without
-	 * loss of precision is picked. That is, {@code FLOAT} for u8, i8, u16, i16,
-	 * i32, f32, and otherwise {@code DOUBLE} for u32, i64, f64.
-	 */
-	public enum ComputationType
-	{
-		FLOAT, DOUBLE, AUTO
-	}
 
 	public enum Interpolation
 	{

src/test/java/net/imglib2/algorithm/blocks/downsample/DownsampleBdvBenchmark.java

@@ -45,7 +45,7 @@
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.algorithm.blocks.BlockSupplier;
-import net.imglib2.algorithm.blocks.downsample.Downsample.ComputationType;
+import net.imglib2.algorithm.blocks.ComputationType;
 import net.imglib2.algorithm.blocks.downsample.Downsample.Offset;
 import net.imglib2.algorithm.blocks.BlockAlgoUtils;
 import net.imglib2.cache.img.CachedCellImg;

src/test/java/net/imglib2/algorithm/blocks/downsample/DownsampleBdvPlayground.java

@@ -44,7 +44,7 @@
 import java.util.Arrays;
 import net.imglib2.RandomAccess;
 import net.imglib2.algorithm.blocks.BlockSupplier;
-import net.imglib2.algorithm.blocks.downsample.Downsample.ComputationType;
+import net.imglib2.algorithm.blocks.ComputationType;
 import net.imglib2.algorithm.blocks.downsample.Downsample.Offset;
 import net.imglib2.algorithm.blocks.BlockAlgoUtils;
 import net.imglib2.cache.img.CachedCellImg;

src/test/java/net/imglib2/algorithm/blocks/downsample/DownsampleDoublePlayground.java

@@ -44,6 +44,7 @@
 
 import net.imglib2.algorithm.blocks.BlockSupplier;
 import net.imglib2.algorithm.blocks.BlockAlgoUtils;
+import net.imglib2.algorithm.blocks.ComputationType;
 import net.imglib2.cache.img.CachedCellImg;
 import net.imglib2.converter.Converters;
 import net.imglib2.converter.RealDoubleConverter;
@@ -80,7 +81,7 @@ public static void main( String[] args )
 		final int[] cellDimensions = { 64, 64, 64 };
 		final CachedCellImg< DoubleType, ? > downsampled = BlockAlgoUtils.cellImg(
 				blocks.andThen( Downsample.downsample(
-						Downsample.ComputationType.DOUBLE,
+						ComputationType.DOUBLE,
 						Downsample.Offset.CENTERED )
 				),
 				downsampledDimensions, cellDimensions );
@@ -98,7 +99,7 @@ public static void main( String[] args )
 
 		final CachedCellImg< DoubleType, ? > downsampled2 = BlockAlgoUtils.cellImg(
 				blocks.andThen( Downsample.downsample(
-						Downsample.ComputationType.DOUBLE,
+						ComputationType.DOUBLE,
 						Downsample.Offset.HALF_PIXEL )
 				),
 				downsampledDimensions, cellDimensions );

src/test/java/net/imglib2/algorithm/blocks/downsample/DownsampleMemProfile.java

@@ -42,7 +42,7 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.algorithm.blocks.BlockAlgoUtils;
 import net.imglib2.algorithm.blocks.BlockSupplier;
-import net.imglib2.algorithm.blocks.downsample.Downsample.ComputationType;
+import net.imglib2.algorithm.blocks.ComputationType;
 import net.imglib2.algorithm.blocks.downsample.Downsample.Offset;
 import net.imglib2.cache.img.CachedCellImg;
 import net.imglib2.img.array.ArrayImgs;

src/test/java/net/imglib2/algorithm/blocks/downsample/DownsampleUnsignedBytePlayground.java

@@ -43,7 +43,7 @@
 import java.util.Arrays;
 
 import net.imglib2.algorithm.blocks.BlockSupplier;
-import net.imglib2.algorithm.blocks.downsample.Downsample.ComputationType;
+import net.imglib2.algorithm.blocks.ComputationType;
 import net.imglib2.algorithm.blocks.downsample.Downsample.Offset;
 import net.imglib2.algorithm.blocks.BlockAlgoUtils;
 import net.imglib2.cache.img.CachedCellImg;

src/test/java/net/imglib2/algorithm/blocks/transform/TransformBenchmark3D.java

@@ -44,7 +44,7 @@
 import net.imglib2.RealRandomAccessible;
 import net.imglib2.algorithm.blocks.BlockProcessor;
 import net.imglib2.algorithm.blocks.ClampType;
-import net.imglib2.algorithm.blocks.transform.Transform.ComputationType;
+import net.imglib2.algorithm.blocks.ComputationType;
 import net.imglib2.algorithm.blocks.transform.Transform.Interpolation;
 import net.imglib2.blocks.PrimitiveBlocks;
 import net.imglib2.converter.Converters;