Further cleanup

gselzer · gselzer · commit edefad2e8460 · 2025-02-10T08:42:20.000-06:00
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/threshold/AbstractApplyThresholdImg.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/threshold/AbstractApplyThresholdImg.java
@@ -41,24 +41,48 @@
 import org.scijava.ops.spi.OpDependency;
 
 /**
+ * An abstract base class for Ops using a {@link Histogram1d} to compute a
+ * threshold across an {@link Iterable}.
+ * <p>
+ * Note the use of type parameters {@code I} and {@code J}, allowing
+ * dependencies to be matched on the concrete input types instead of just on
+ * {@link Iterable}
+ * </p>
+ *
  * @author Curtis Rueden
  * @author Christian Dietz (University of Konstanz)
+ * @author Gabriel Selzer
+ * @param <T> the {@link RealType} implementation of input elements
+ * @param <I> the {@link Iterable} subclass of the input
+ * @param <J> the {@link Iterable} subclass of the output
  */
-public abstract class AbstractApplyThresholdImg<T extends RealType<T>, I extends Iterable<T>, J extends Iterable<BitType>> extends
-	AbstractApplyThresholdIterable<T, I, J>
-{
+public abstract class AbstractApplyThresholdImg< //
+		T extends RealType<T>, //
+		I extends Iterable<T>, //
+		J extends Iterable<BitType> //
+	> implements Computers.Arity1<I, J> {
 
 	@OpDependency(name = "image.histogram")
 	private Function<I, Histogram1d<T>> createHistogramOp;
 
+	@OpDependency(name = "threshold.apply")
+	private Computers.Arity2<I, T, J> applyThresholdOp;
+
+	/**
+	 * Thresholds {@code input}, storing the result in {@code output}.
+	 *
+	 * @param input the input dataset
+	 * @param output the output dataset
+	 */
 	@Override
-	protected T computeThreshold(final I input) {
+	public void compute(final I input, final J output) {
+		// Compute the histogram
 		final var inputHistogram = createHistogramOp.apply(input);
+		// Compute the threshold value from the histogram
 		final var threshold = input.iterator().next().createVariable();
-		final var computeThresholdOp =
-			getComputeThresholdOp();
-		computeThresholdOp.compute(inputHistogram, threshold);
-		return threshold;
+		getComputeThresholdOp().compute(inputHistogram, threshold);
+		// Threshold the image against the computed value
+		applyThresholdOp.compute(input, threshold, output);
 	}
 
 	protected abstract Computers.Arity1<Histogram1d<T>, T>
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/threshold/AbstractApplyThresholdIterable.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/threshold/AbstractApplyThresholdIterable.java
diff --git a/scijava-ops-image/src/test/java/org/scijava/ops/image/threshold/apply/ApplyConstantThresholdTest.java b/scijava-ops-image/src/test/java/org/scijava/ops/image/threshold/apply/ApplyConstantThresholdTest.java
@@ -37,21 +37,19 @@
 import net.imglib2.RandomAccessibleInterval;
 import org.scijava.ops.image.threshold.AbstractThresholdTest;
 import net.imglib2.exception.IncompatibleTypeException;
-import net.imglib2.img.Img;
 import net.imglib2.type.logic.BitType;
 import net.imglib2.type.numeric.integer.UnsignedShortType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.function.Computers;
-import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
- * Tests {@link ApplyManualThreshold}.
+ * Tests {@link ApplyConstantThreshold} and its wrappers.
  *
  * @author Curtis Rueden
+ * @author Gabriel Selzer
  */
-public class ApplyManualThresholdTest extends AbstractThresholdTest {
+public class ApplyConstantThresholdTest extends AbstractThresholdTest {
 
 	@Test
 	public void testApplyThreshold() throws IncompatibleTypeException {
@@ -73,7 +71,7 @@ public void testApplyThresholdRAIs() {
 	@Test
 	public void testApplyThresholdIterables() {
 		List<UnsignedShortType> itr = in.stream().collect(Collectors.toList());
-		List<UnsignedShortType> output = new ArrayList<UnsignedShortType>(itr.size());
+		List<UnsignedShortType> output = new ArrayList<>(itr.size());
 
 		ops.op("threshold.mean") //
 				.input(in) //
