Beautify AbstractHaralickFeature

gselzer · gselzer · commit a8cabdc9d3e3 · 2024-01-10T16:29:45.000-06:00
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/features/haralick/AbstractHaralickFeature.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/features/haralick/AbstractHaralickFeature.java
@@ -48,7 +48,7 @@ public abstract class AbstractHaralickFeature<T extends RealType<T>>
 		implements Functions.Arity4<RandomAccessibleInterval<T>, Integer, Integer, MatrixOrientation, DoubleType> {
 
 	@OpDependency(name = "image.cooccurrenceMatrix")
-	private Functions.Arity4<RandomAccessibleInterval<T>, Integer, Integer, MatrixOrientation, double[][]> coocFunc;
+	private Functions.Arity4<RandomAccessibleInterval<T>, MatrixOrientation, Integer, Integer, double[][]> coocFunc;
 
 	/**
 	 * given the specified parameters. No caching!
@@ -59,7 +59,7 @@ protected double[][] getCooccurrenceMatrix(final RandomAccessibleInterval<T> inp
 			final Integer distance, final MatrixOrientation matrixOrientation) {
 		if (matrixOrientation.numDims() != input.numDimensions())
 			throw new IllegalArgumentException("MatrixOrientation must be of the same dimensions as the input!");
-		return coocFunc.apply(input, numGreyLevels, distance, matrixOrientation);
+		return coocFunc.apply(input, matrixOrientation, numGreyLevels, distance);
 	}
 
 }
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/image/cooccurrenceMatrix/CooccurrenceMatrix.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/image/cooccurrenceMatrix/CooccurrenceMatrix.java
@@ -31,6 +31,7 @@
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.spi.Nullable;
 import org.scijava.ops.spi.OpDependency;
 
 import net.imglib2.RandomAccessibleInterval;
@@ -47,7 +48,7 @@
  *@implNote op names='image.cooccurrenceMatrix'
  */
 public class CooccurrenceMatrix<T extends RealType<T>>
-		implements Functions.Arity4<RandomAccessibleInterval<T>, Integer, Integer, MatrixOrientation, double[][]> {
+		implements Functions.Arity4<RandomAccessibleInterval<T>, MatrixOrientation, Integer, Integer, double[][]> {
 
 	@OpDependency(name = "stats.minMax")
 	private Function<RandomAccessibleInterval<T>, Pair<T, T>> minmax;
@@ -63,8 +64,27 @@ public class CooccurrenceMatrix<T extends RealType<T>>
 	 * @return the co-occurence matrix
 	 */
 	@Override
-	public double[][] apply(RandomAccessibleInterval<T> input, Integer nrGreyLevels, Integer distance,
-			MatrixOrientation orientation) {
+	public double[][] apply( //
+			RandomAccessibleInterval<T> input, //
+			MatrixOrientation orientation,  //
+			@Nullable Integer nrGreyLevels, //
+			@Nullable Integer distance //
+	) {
+		// nrGreyLevels validation
+		if (nrGreyLevels == null) {
+			nrGreyLevels = 32;
+		}
+		if (nrGreyLevels < 0 || nrGreyLevels > 128) {
+			throw new IllegalArgumentException("nrGreyLevels must be between 0 and 128 (inclusive) but was " + nrGreyLevels);
+		}
+		// distance validation
+		if (distance == null) {
+			distance = 1;
+		}
+		if (distance < 0 || distance > 128) {
+			throw new IllegalArgumentException("distance must be between 0 and 128 (inclusive) but was " + distance);
+		}
+
 		if (input.numDimensions() == 3 && orientation.isCompatible(3)) {
 			return CooccurrenceMatrix3D.apply(input, nrGreyLevels, distance, minmax, orientation);
 		} else if (input.numDimensions() == 2 && orientation.isCompatible(2)) {
diff --git a/scijava-ops-image/src/test/java/org/scijava/ops/image/OpRegressionTest.java b/scijava-ops-image/src/test/java/org/scijava/ops/image/OpRegressionTest.java
@@ -42,7 +42,7 @@ public class OpRegressionTest {
 
 	@Test
 	public void opDiscoveryRegressionIT() {
-		long expected = 1880;
+		long expected = 1882;
 		long actual = ops.infos().size();
 		assertEquals(expected, actual);
 	}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public abstract class AbstractHaralickFeature<T extends RealType<T>>`
`48`	`48`	`implements Functions.Arity4<RandomAccessibleInterval<T>, Integer, Integer, MatrixOrientation, DoubleType> {`
`49`	`49`
`50`	`50`	`@OpDependency(name = "image.cooccurrenceMatrix")`
`51`		`- private Functions.Arity4<RandomAccessibleInterval<T>, Integer, Integer, MatrixOrientation, double[][]> coocFunc;`
	`51`	`+ private Functions.Arity4<RandomAccessibleInterval<T>, MatrixOrientation, Integer, Integer, double[][]> coocFunc;`
`52`	`52`
`53`	`53`	`/**`
`54`	`54`	`* given the specified parameters. No caching!`
`@@ -59,7 +59,7 @@ protected double[][] getCooccurrenceMatrix(final RandomAccessibleInterval<T> inp`
`59`	`59`	`final Integer distance, final MatrixOrientation matrixOrientation) {`
`60`	`60`	`if (matrixOrientation.numDims() != input.numDimensions())`
`61`	`61`	`throw new IllegalArgumentException("MatrixOrientation must be of the same dimensions as the input!");`
`62`		`- return coocFunc.apply(input, numGreyLevels, distance, matrixOrientation);`
	`62`	`+ return coocFunc.apply(input, matrixOrientation, numGreyLevels, distance);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public class OpRegressionTest {`
`42`	`42`
`43`	`43`	`@Test`
`44`	`44`	`public void opDiscoveryRegressionIT() {`
`45`		`- long expected = 1880;`
	`45`	`+ long expected = 1882;`
`46`	`46`	`long actual = ops.infos().size();`
`47`	`47`	`assertEquals(expected, actual);`
`48`	`48`	`}`