Transforms.addDimension: default to interval

hinerm · hinerm · commit 124f97888d2d · 2024-08-22T13:16:15.000-05:00
Closes #268
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/transform/Transforms.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/transform/Transforms.java
@@ -79,13 +79,21 @@
  */
 public class Transforms<T, R extends RealType<R>, N extends NumericType<N>, Y extends Type<Y>, F extends RandomAccessibleInterval<T>, E extends EuclideanSpace> {
 
+	/**
+	 * @input input
+	 * @output result
+	 * @implNote op names='transform.addDimensionView', priority='-100.'
+	 */
+	public final Function<RandomAccessible<T>, MixedTransformView<T>>
+			addDimensionMixedView = Views::addDimension;
+
 	/**
 	 * @input input
 	 * @output result
 	 * @implNote op names='transform.addDimensionView'
 	 */
-	public final Function<RandomAccessible<T>, MixedTransformView<T>> addDimensionView =
-		Views::addDimension;
+	public final Function<RandomAccessibleInterval<T>, IntervalView<T>> addDimensionView =
+			(RandomAccessibleInterval<T> interval) -> Views.addDimension(interval, 0, 0);
 
 	/**
 	 * @input input
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 testOpDiscoveryRegression() {
-		long expected = 1940;
+		long expected = 1941;
 		long actual = ops.infos().size();
 		assertEquals(expected, actual);
 	}
diff --git a/scijava-ops-image/src/test/java/org/scijava/ops/image/transform/addDimensionView/AddDimensionViewTest.java b/scijava-ops-image/src/test/java/org/scijava/ops/image/transform/addDimensionView/AddDimensionViewTest.java
@@ -85,6 +85,25 @@ public void testAddDimension() {
 		}
 	}
 
+	@Test
+	public void testAddDimensionIterable() {
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(
+				new int[] { 10, 10 });
+
+		IntervalView<DoubleType> il2 = Views.addDimension(img, 0, 0);
+
+		Function<RandomAccessibleInterval<DoubleType>, IntervalView<DoubleType>> addDimFunc =
+				ops.op("transform.addDimensionView",
+						new Nil<Function<RandomAccessibleInterval<DoubleType>, IntervalView<DoubleType>>>()
+						{}, new Nil[] { new Nil<RandomAccessibleInterval<DoubleType>>() {} }, new Nil<IntervalView<DoubleType>>() {});
+		IntervalView<DoubleType> opr = addDimFunc.apply(img);
+
+		assertEquals(il2.numDimensions(), opr.numDimensions(), 0.0);
+		for (int i = 0; i < il2.numDimensions(); i++) {
+			assertEquals(il2.dimension(i), opr.dimension(i), 0.0);
+		}
+	}
+
 	@Test
 	public void testAddDimensionMinMax() {
 		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(

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