Get the remaining tests working

gselzer · gselzer · commit 83054c69bec9 · 2025-01-15T15:39:27.000-06:00
Note the bump in imglib2-algorithm version, avoiding calls to
net.imglib2.view.Views.flatIterable
diff --git a/scijava-ops-image/pom.xml b/scijava-ops-image/pom.xml
@@ -269,7 +269,7 @@
 
 		<imglib2.version>7.0.1</imglib2.version>
 		<imglib2-roi.version>0.15.0</imglib2-roi.version>
-		<imglib2-algorithm.version>0.15.1</imglib2-algorithm.version>
+		<imglib2-algorithm.version>0.15.2</imglib2-algorithm.version>
 		<imglib2-realtransform.version>4.0.3</imglib2-realtransform.version>
 	</properties>
 
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/coloc/pValue/DefaultPValue.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/coloc/pValue/DefaultPValue.java
@@ -29,7 +29,6 @@
 
 package org.scijava.ops.image.coloc.pValue;
 
-import java.util.List;
 import java.util.Random;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
@@ -39,12 +38,9 @@
 import org.scijava.concurrent.Parallelization;
 import org.scijava.function.Computers;
 import org.scijava.ops.spi.Nullable;
-import org.scijava.ops.spi.OpDependency;
 
 import org.scijava.ops.image.coloc.ShuffledView;
-import net.imglib2.Cursor;
 import net.imglib2.Dimensions;
-import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.img.Img;
 import net.imglib2.type.numeric.RealType;
@@ -63,7 +59,7 @@
  */
 public class DefaultPValue<T extends RealType<T>, U extends RealType<U>>
 	implements
-	Computers.Arity6<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double>, Integer, Dimensions, Long, PValueResult>
+	Computers.Arity6<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, BiFunction<? super RandomAccessibleInterval<T>, ? super RandomAccessibleInterval<U>, Double>, Integer, Dimensions, Long, PValueResult>
 {
 
 	/**
@@ -81,7 +77,7 @@ public class DefaultPValue<T extends RealType<T>, U extends RealType<U>>
 	public void compute( //
 		final RandomAccessibleInterval<T> image1, //
 		final RandomAccessibleInterval<U> image2, //
-		final BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double> op, //
+		final BiFunction<? super RandomAccessibleInterval<T>, ? super RandomAccessibleInterval<U>, Double> op, //
 		@Nullable Integer nrRandomizations, //
 		@Nullable Dimensions psfSize, //
 		@Nullable Long seed, //
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 = 1941;
+		long expected = 1940;
 		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 testOpDiscoveryRegression() {`
`45`		`- long expected = 1941;`
	`45`	`+ long expected = 1940;`
`46`	`46`	`long actual = ops.infos().size();`
`47`	`47`	`assertEquals(expected, actual);`
`48`	`48`	`}`