Zernike Features: change output type

gselzer · gselzer · commit 8cc6a4480654 · 2020-02-14T16:55:23.000-06:00
These types should always be some sort of decimal. We do not want to
allow the user to pass an integer-based type of sorts since then
the output information will be lost.
diff --git a/src/main/java/net/imagej/ops/features/zernike/DefaultMagnitudeFeature.java b/src/main/java/net/imagej/ops/features/zernike/DefaultMagnitudeFeature.java
@@ -31,6 +31,7 @@
 import net.imagej.ops.features.zernike.helper.ZernikeMoment;
 import net.imglib2.IterableInterval;
 import net.imglib2.type.numeric.RealType;
+import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
@@ -48,22 +49,20 @@
  *
  * @param <T>
  *            Input Type
- * @param <O>
- *            Output Type
  */
 @Plugin(type = Op.class, name = "features.zernike.magnitude")
 @Parameter(key = "input")
 @Parameter(key = "order")
 @Parameter(key = "repetition")
 @Parameter(key = "output", itemIO = ItemIO.BOTH)
-public class DefaultMagnitudeFeature<T extends RealType<T>, O extends RealType<O>>
-		implements Computers.Arity3<IterableInterval<T>, Integer, Integer, O> {
+public class DefaultMagnitudeFeature<T extends RealType<T>>
+		implements Computers.Arity3<IterableInterval<T>, Integer, Integer, DoubleType> {
 
 	@OpDependency(name = "features.zernike.computer")
 	private Functions.Arity3<IterableInterval<T>, Integer, Integer, ZernikeMoment> zernikeOp;
 
 	@Override
-	public void compute(IterableInterval<T> input, Integer order, Integer repetition, O output) {
+	public void compute(IterableInterval<T> input, Integer order, Integer repetition, DoubleType output) {
 		if (input.numDimensions() != 2)
 			throw new IllegalArgumentException("Only 2 dimensional inputs allowed!");
 		output.setReal(zernikeOp.apply(input, order, repetition).getMagnitude());
diff --git a/src/main/java/net/imagej/ops/features/zernike/DefaultPhaseFeature.java b/src/main/java/net/imagej/ops/features/zernike/DefaultPhaseFeature.java
@@ -31,6 +31,7 @@
 import net.imagej.ops.features.zernike.helper.ZernikeMoment;
 import net.imglib2.IterableInterval;
 import net.imglib2.type.numeric.RealType;
+import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
@@ -56,14 +57,14 @@
 @Parameter(key = "order")
 @Parameter(key = "repetition")
 @Parameter(key = "output", itemIO = ItemIO.BOTH)
-public class DefaultPhaseFeature<T extends RealType<T>, O extends RealType<O>>
-		implements Computers.Arity3<IterableInterval<T>, Integer, Integer, O> {
+public class DefaultPhaseFeature<T extends RealType<T>>
+		implements Computers.Arity3<IterableInterval<T>, Integer, Integer, DoubleType> {
 
 	@OpDependency(name = "features.zernike.computer")
 	private Functions.Arity3<IterableInterval<T>, Integer, Integer, ZernikeMoment> zernikeOp;
 
 	@Override
-	public void compute(IterableInterval<T> input, Integer order, Integer repetition, O output) {
+	public void compute(IterableInterval<T> input, Integer order, Integer repetition, DoubleType output) {
 		if (input.numDimensions() != 2)
 			throw new IllegalArgumentException("Only 2 dimensional inputs allowed!");
 		output.setReal(zernikeOp.apply(input, order, repetition).getPhase());
