Add OpRunner -> NullaryComputer support

gselzer · ctrueden · commit d3d220592cc0 · 2019-09-22T17:22:16.000+02:00
diff --git a/src/main/java/org/scijava/ops/transform/FunctionalToOpRunnerTransformer.java b/src/main/java/org/scijava/ops/transform/FunctionalToOpRunnerTransformer.java
@@ -46,6 +46,7 @@
 import org.scijava.ops.core.computer.Computer3;
 import org.scijava.ops.core.computer.Computer4;
 import org.scijava.ops.core.computer.Computer5;
+import org.scijava.ops.core.computer.NullaryComputer;
 import org.scijava.ops.core.function.Function3;
 import org.scijava.ops.core.function.Function4;
 import org.scijava.ops.core.function.Function5;
@@ -125,6 +126,7 @@ private static boolean isOpRunner(final OpRef targetRef) {
 	private static OpRunner computerToRunner(final Object src, final Class<?> srcFunctionalRawType)
 		throws OpTransformationException
 	{
+		if (src instanceof NullaryComputer) return OpRunners.Computers.toRunner((NullaryComputer<?>) src); 
 		if (src instanceof Computer) return OpRunners.Computers.toRunner((Computer<?, ?>) src);
 		if (src instanceof BiComputer) return OpRunners.Computers.toRunner((BiComputer<?, ?, ?>) src);
 		if (src instanceof Computer3) return OpRunners.Computers.toRunner((Computer3<?, ?, ?, ?>) src);
diff --git a/src/main/java/org/scijava/ops/util/Adapt.java b/src/main/java/org/scijava/ops/util/Adapt.java
@@ -17,9 +17,11 @@
 import org.scijava.ops.core.computer.Computer3;
 import org.scijava.ops.core.computer.Computer4;
 import org.scijava.ops.core.computer.Computer5;
+import org.scijava.ops.core.computer.NullaryComputer;
 import org.scijava.ops.core.function.Function3;
 import org.scijava.ops.core.function.Function4;
 import org.scijava.ops.core.function.Function5;
+import org.scijava.ops.core.function.Source;
 import org.scijava.ops.core.inplace.BiInplaceFirst;
 import org.scijava.ops.core.inplace.BiInplaceSecond;
 import org.scijava.ops.core.inplace.Inplace;
@@ -120,6 +122,15 @@ public static <I1, I2, I3, I4, O> BiFunction<I1, I2, O> asBiFunction(
 	 */
 	public static class Computers {
 		private Computers() {}
+		
+		public static <O> Source<O> asFunction(final NullaryComputer<O> computer,
+				final Source<O> inputAwareSource) {
+			return () -> {
+				O out = inputAwareSource.get();
+				computer.compute(out);
+				return out;
+			};
+		}
 
 		public static <I, O> Function<I, O> asFunction(final Computer<I, O> computer,
 				final Function<I, O> inputAwareSource) {
diff --git a/src/main/java/org/scijava/ops/util/OpRunners.java b/src/main/java/org/scijava/ops/util/OpRunners.java
@@ -9,10 +9,12 @@
 import org.scijava.ops.core.computer.Computer3;
 import org.scijava.ops.core.computer.Computer4;
 import org.scijava.ops.core.computer.Computer5;
+import org.scijava.ops.core.computer.NullaryComputer;
 import org.scijava.ops.core.function.Function3;
 import org.scijava.ops.core.function.Function4;
 import org.scijava.ops.core.function.Function5;
 import org.scijava.ops.core.function.Function6;
+import org.scijava.ops.core.function.Source;
 import org.scijava.ops.core.inplace.BiInplaceFirst;
 import org.scijava.ops.core.inplace.BiInplaceSecond;
 import org.scijava.ops.core.inplace.Inplace;
@@ -205,6 +207,29 @@ public O run(Object[] args) {
 	}
 
 	public static class Computers {
+		public static <O> OpRunner toRunner(NullaryComputer<O> computer) {
+			return new OpRunner() {
+
+				@Override
+				public Object getAdaptedOp() {
+					return computer;
+				}
+				
+				@Override
+				public Nil<?>[] inTypes() {
+					return new Nil<?>[] {};
+				}
+
+				@SuppressWarnings("unchecked")
+				@Override
+				public O run(Object[] args) {
+					Source<O> source = () -> (O) args[0];
+					return Adapt.Computers.asFunction(computer, source).get();
+				}
+
+			};
+		}
+		
 		public static <I, O> OpRunner toRunner(Computer<I, O> computer) {
 			return new OpRunner() {
 
