Add optional params to BoxCount

gselzer · gselzer · commit a1148847fd32 · 2024-01-11T10:46:57.000-06:00
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/topology/BoxCount.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/topology/BoxCount.java
@@ -47,6 +47,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.spi.Nullable;
 
 /**
  * An N-dimensional box counting that can be used to estimate the fractal
@@ -103,11 +104,15 @@ private BoxCount() {
 	 * @return A list of (log(foreground count), -log(section size))
 	 *         {@link ValuePair} objects for curve fitting
 	 */
-	public static <B extends BooleanType<B>>
-		List<ValuePair<DoubleType, DoubleType>> apply(
-			final RandomAccessibleInterval<B> input, final Long maxSize,
-			final Long minSize, final Double scaling, final Long gridMoves)
-	{
+	public static <B extends BooleanType<B>> //
+		List<ValuePair<DoubleType, DoubleType>> apply( //
+			final RandomAccessibleInterval<B> input, //
+			final Long maxSize, //
+			final Long minSize, //
+			final Double scaling, //
+			final Long gridMoves //
+	) {
+
 		if (scaling <= 1.0) {
 			throw new IllegalArgumentException(
 				"Scaling must be > 1.0 or algorithm won't stop.");
@@ -344,10 +349,25 @@ class DefaultBoxCount<B extends BooleanType<B>> implements
 	 * @return the output
 	 */
 	@Override
-	public List<ValuePair<DoubleType, DoubleType>> apply(
-		RandomAccessibleInterval<B> input, Long maxSize, Long minSize,
-		Double scaling, Long gridMoves)
-	{
+	public List<ValuePair<DoubleType, DoubleType>> apply( //
+		final RandomAccessibleInterval<B> input, //
+		@Nullable Long maxSize, //
+		@Nullable Long minSize, //
+		@Nullable Double scaling, //
+		@Nullable Long gridMoves //
+	) {
+		if (maxSize == null) {
+			maxSize = 48L;
+		}
+		if (minSize == null) {
+			minSize = 5L;
+		}
+		if (scaling == null) {
+			scaling = 1.2;
+		}
+		if (gridMoves == null) {
+			gridMoves = 0L;
+		}
 		return BoxCount.apply(input, maxSize, minSize, scaling, gridMoves);
 	}
 
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 = 1878;
+		long expected = 1882;
 		long actual = ops.infos().size();
 		assertEquals(expected, actual);
 	}

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 = 1878;`
	`45`	`+ long expected = 1882;`
`46`	`46`	`long actual = ops.infos().size();`
`47`	`47`	`assertEquals(expected, actual);`
`48`	`48`	`}`