Rename RichardsonLucyF

gselzer · gselzer · commit b6c5a01d661a · 2024-01-10T14:00:58.000-06:00
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/deconvolve/PadAndRichardsonLucy.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/deconvolve/PadAndRichardsonLucy.java
@@ -61,7 +61,7 @@
  * @param <C>
  * @implNote op names='deconvolve.richardsonLucy', priority='100.'
  */
-public class RichardsonLucyF<I extends RealType<I> & NativeType<I>, O extends RealType<O> & NativeType<O>, K extends RealType<K> & NativeType<K>, C extends ComplexType<C> & NativeType<C>>
+public class PadAndRichardsonLucy<I extends RealType<I> & NativeType<I>, O extends RealType<O> & NativeType<O>, K extends RealType<K> & NativeType<K>, C extends ComplexType<C> & NativeType<C>>
 		implements
 		Functions.Arity10<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, O, C, Integer, Boolean, Boolean, long[], OutOfBoundsFactory<I, RandomAccessibleInterval<I>>, OutOfBoundsFactory<K, RandomAccessibleInterval<K>>, RandomAccessibleInterval<O>> {
 
@@ -196,15 +196,24 @@ private void computeFilter(final RandomAccessibleInterval<I> input,
 	@Override
 	public RandomAccessibleInterval<O> apply(RandomAccessibleInterval<I> input, RandomAccessibleInterval<K> kernel,
 			O outType, C complexType, Integer maxIterations,
-			Boolean nonCirculant, Boolean accelerate,
+			@Nullable Boolean nonCirculant, @Nullable Boolean accelerate,
 			@Nullable long[] borderSize,
 			@Nullable OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
 			@Nullable OutOfBoundsFactory<K, RandomAccessibleInterval<K>> obfKernel)
 	{
 		if (obfInput == null)
 			obfInput = new OutOfBoundsConstantValueFactory<>(Util.getTypeFromInterval(input).createVariable());
 
-		this.nonCirculant = nonCirculant;
+		if (nonCirculant == null) {
+			this.nonCirculant = false;
+		}
+		else {
+			this.nonCirculant = nonCirculant;
+		}
+
+		if (accelerate == null) {
+			accelerate = false;
+		}
 		this.maxIterations = maxIterations;
 
 		RandomAccessibleInterval<O> output = outputCreator.apply(input, outType);
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 = 1868;
+		long expected = 1871;
 		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 = 1868;`
	`45`	`+ long expected = 1871;`
`46`	`46`	`long actual = ops.infos().size();`
`47`	`47`	`assertEquals(expected, actual);`
`48`	`48`	`}`