WIP: LiICQ: Fix OpDependencies, test

gselzer · ctrueden · commit ce01ff0d9643 · 2019-09-22T19:45:05.000+02:00
TODO: finish fixing test
diff --git a/src/main/java/net/imagej/ops/coloc/icq/LiICQ.java b/src/main/java/net/imagej/ops/coloc/icq/LiICQ.java
@@ -62,7 +62,9 @@ public class LiICQ<T extends RealType<T>, U extends RealType<U>, V extends RealT
 		implements Function4<Iterable<T>, Iterable<U>, DoubleType, DoubleType, Double> {
 
 	@OpDependency(name = "stats.mean")
-	private Computer<Iterable<? extends RealType<?>>, DoubleType> meanOp;
+	private Computer<Iterable<T>, DoubleType> meanTOp;
+	@OpDependency(name = "stats.mean")
+	private Computer<Iterable<U>, DoubleType> meanUOp;
 
 	@Override
 	public Double apply(final Iterable<T> image1, final Iterable<U> image2, final DoubleType mean1, final DoubleType mean2) {
@@ -73,8 +75,8 @@ public Double apply(final Iterable<T> image1, final Iterable<U> image2, final Do
 
 		final Iterable<Pair<T, U>> samples = new IterablePair<>(image1, image2);
 
-		final double m1 = mean1 == null ? computeMeanOf(image1) : mean1.get();
-		final double m2 = mean2 == null ? computeMeanOf(image2) : mean2.get();
+		final double m1 = mean1 == null ? computeMeanTOf(image1) : mean1.get();
+		final double m2 = mean2 == null ? computeMeanUOf(image2) : mean2.get();
 
 		// variables to count the positive and negative results
 		// of Li's product of the difference of means.
@@ -104,9 +106,14 @@ public Double apply(final Iterable<T> image1, final Iterable<U> image2, final Do
 		return icqValue;
 	}
 
-	private double computeMeanOf(final Iterable<? extends RealType<?>> in) {
+	private double computeMeanTOf(final Iterable<T> in) {
+		DoubleType mean = new DoubleType();
+		meanTOp.compute(in, mean);
+		return mean.get();
+	}
+	private double computeMeanUOf(final Iterable<U> in) {
 		DoubleType mean = new DoubleType();
-		meanOp.compute(in, mean);
+		meanUOp.compute(in, mean);
 		return mean.get();
 	}
 
diff --git a/src/test/java/net/imagej/ops/coloc/icq/LiICQTest.java b/src/test/java/net/imagej/ops/coloc/icq/LiICQTest.java
@@ -32,6 +32,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.util.concurrent.ExecutorService;
 import java.util.function.BiFunction;
 
 import net.imagej.ops.coloc.ColocalisationTest;
@@ -43,6 +44,7 @@
 import org.junit.Test;
 import org.scijava.ops.types.Nil;
 import org.scijava.ops.util.Functions;
+import org.scijava.thread.ThreadService;
 
 /**
  * Tests {@link net.imagej.ops.Ops.Coloc.ICQ}.
@@ -67,7 +69,7 @@ public void testICQ() {
 	 */
 	@Test
 	public void liPositiveCorrTest() {
-		final Object icqValue = ops.run("color.icq", positiveCorrelationImageCh1, positiveCorrelationImageCh2);
+		final Object icqValue = ops.run("coloc.icq", positiveCorrelationImageCh1, positiveCorrelationImageCh2);
 
 		assertTrue(icqValue instanceof Double);
 		final double icq = (Double) icqValue;
@@ -92,6 +94,7 @@ public void liZeroCorrTest() {
 	 */
 	@Test
 	public void testPValue() {
+		ExecutorService es = context.getService(ThreadService.class).getExecutorService();
 		final double mean = 0.2;
 		final double spread = 0.1;
 		final double[] sigma = new double[] { 3.0, 3.0 };
@@ -102,7 +105,7 @@ public void testPValue() {
 		BiFunction<Iterable<FloatType>, Iterable<FloatType>, Double> op = Functions.binary(ops, "coloc.icq",
 				new Nil<Iterable<FloatType>>() {}, new Nil<Iterable<FloatType>>() {}, new Nil<Double>() {});
 		PValueResult value = new PValueResult();
-		ops.run("coloc.pValue", ch1, ch2, op, value);
+		ops.run("coloc.pValue", ch1, ch2, op, es, value);
 		assertEquals(0.72, value.getPValue(), 0.0);
 	}
 
