Fix PolygonFeatureTests

gselzer · gselzer · commit 6fbfd67d7cfc · 2020-02-28T15:37:25.000-06:00
diff --git a/src/main/java/net/imagej/ops/geom/geom2d/DefaultMaximumFeretDiameter.java b/src/main/java/net/imagej/ops/geom/geom2d/DefaultMaximumFeretDiameter.java
@@ -30,6 +30,7 @@
 
 import java.util.function.Function;
 
+import net.imglib2.RealLocalizable;
 import net.imglib2.roi.geom.real.Polygon2D;
 import net.imglib2.type.numeric.real.DoubleType;
 import net.imglib2.util.Pair;
@@ -46,12 +47,10 @@
 @Parameter(key = "maxFeretsDiameter", itemIO = ItemIO.BOTH)
 public class DefaultMaximumFeretDiameter implements Computers.Arity1<Polygon2D, DoubleType> {
 
-	@SuppressWarnings("rawtypes")
 	@OpDependency(name = "geom.maximumFeret")
-	private Function<Polygon2D, Pair> maxFeret;
-	@SuppressWarnings("rawtypes")
+	private Function<Polygon2D, Pair<RealLocalizable, RealLocalizable>> maxFeret;
 	@OpDependency(name = "geom.feretsDiameter")
-	private Function<Pair, DoubleType> feretDiameter;
+	private Function<Pair<RealLocalizable, RealLocalizable>, DoubleType> feretDiameter;
 
 	@Override
 	public void compute(Polygon2D input, DoubleType output) {
diff --git a/src/main/java/net/imagej/ops/geom/geom2d/LabelRegionToPolygonConverter.java b/src/main/java/net/imagej/ops/geom/geom2d/LabelRegionToPolygonConverter.java
@@ -32,16 +32,18 @@
 import java.lang.reflect.Type;
 import java.util.function.BiFunction;
 
+import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.roi.geom.real.Polygon2D;
 import net.imglib2.roi.labeling.LabelRegion;
+import net.imglib2.type.logic.BoolType;
 
 import org.scijava.Priority;
 import org.scijava.convert.AbstractConverter;
 import org.scijava.convert.ConversionRequest;
 import org.scijava.convert.Converter;
 import org.scijava.ops.OpService;
-import org.scijava.ops.types.Nil;
 import org.scijava.ops.function.Functions;
+import org.scijava.ops.types.Nil;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
@@ -58,14 +60,13 @@ public class LabelRegionToPolygonConverter extends
 	@Parameter
 	private OpService ops;
 
-	//TODO can this LabelRegion be widened?
-	private BiFunction<LabelRegion, Boolean, Polygon2D> contourFunc;
+	private BiFunction<RandomAccessibleInterval<BoolType>, Boolean, Polygon2D> contourFunc;
 
 	@SuppressWarnings({ "unchecked" })
 	@Override
 	public <T> T convert(final Object src, final Class<T> dest) {
 		if (contourFunc == null) {
-			contourFunc = Functions.match(ops, "geom.contour", new Nil<LabelRegion>() {}, new Nil<Boolean>() {},
+			contourFunc = Functions.match(ops, "geom.contour", new Nil<RandomAccessibleInterval<BoolType>>() {}, new Nil<Boolean>() {},
 					new Nil<Polygon2D>() {});
 		}
 		// FIXME: can we make this faster?
diff --git a/src/test/java/net/imagej/ops/geom/PolygonFeatureTests.java b/src/test/java/net/imagej/ops/geom/PolygonFeatureTests.java
@@ -42,7 +42,6 @@
 
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.scijava.ops.core.builder.OpBuilder;
 
 /**
  * Tests for polygon features.
