Add functional type transformers for Bi types and test

Treiblesschorle · gselzer · commit b7f76552de14 · 2019-04-12T12:54:02.000-05:00
diff --git a/src/main/java/org/scijava/ops/transform/functional/BiComputerToBiFunctionTransformer.java b/src/main/java/org/scijava/ops/transform/functional/BiComputerToBiFunctionTransformer.java
@@ -0,0 +1,47 @@
+package org.scijava.ops.transform.functional;
+
+import java.lang.reflect.Type;
+import java.util.function.BiFunction;
+
+import org.scijava.ops.OpService;
+import org.scijava.ops.core.BiComputer;
+import org.scijava.ops.matcher.OpRef;
+import org.scijava.ops.transform.OpTransformer;
+import org.scijava.ops.transform.TypeModUtils;
+import org.scijava.ops.util.Adapt;
+import org.scijava.ops.util.Functions;
+import org.scijava.plugin.Plugin;
+import org.scijava.types.Nil;
+
+@Plugin(type = OpTransformer.class)
+public class BiComputerToBiFunctionTransformer implements FunctionalTypeTransformer {
+
+	@Override
+	public Object transform(OpService opService, OpRef ref, Object src) throws Exception {
+		Type[] outTypes = ref.getOutTypes();
+		Type[] argTypes = ref.getArgs();
+		BiFunction srcOp = Functions.binary(opService, "create", Nil.of(argTypes[0]), Nil.of(argTypes[1]),
+				Nil.of(outTypes[0]));
+		return Adapt.Computers.asBiFunction((BiComputer) src, srcOp);
+	}
+
+	@Override
+	public Class<?> srcClass() {
+		return BiComputer.class;
+	}
+
+	@Override
+	public Class<?> targetClass() {
+		return BiFunction.class;
+	}
+
+	@Override
+	public Type[] getTransformedArgTypes(OpRef toRef) {
+		return TypeModUtils.insert(toRef.getArgs(), toRef.getOutTypes()[0], 2);
+	}
+
+	@Override
+	public Type[] getTransformedOutputTypes(OpRef toRef) {
+		return toRef.getOutTypes();
+	}
+}
diff --git a/src/main/java/org/scijava/ops/transform/functional/BiFunctionToBiComputerTransformer.java b/src/main/java/org/scijava/ops/transform/functional/BiFunctionToBiComputerTransformer.java
@@ -0,0 +1,46 @@
+package org.scijava.ops.transform.functional;
+
+import java.lang.reflect.Type;
+import java.util.function.BiFunction;
+
+import org.scijava.ops.OpService;
+import org.scijava.ops.core.BiComputer;
+import org.scijava.ops.core.Computer;
+import org.scijava.ops.matcher.OpRef;
+import org.scijava.ops.transform.OpTransformer;
+import org.scijava.ops.transform.TypeModUtils;
+import org.scijava.ops.util.Adapt;
+import org.scijava.ops.util.Computers;
+import org.scijava.plugin.Plugin;
+import org.scijava.types.Nil;
+
+@Plugin(type = OpTransformer.class)
+public class BiFunctionToBiComputerTransformer implements FunctionalTypeTransformer {
+
+	@Override
+	public Object transform(OpService opService, OpRef ref, Object src) {
+		Type[] outTypes = ref.getOutTypes();
+		Computer copy = Computers.unary(opService, "copy", Nil.of(outTypes[0]), Nil.of(outTypes[0]));
+		return Adapt.Functions.asBiComputer((BiFunction) src, copy);
+	}
+
+	@Override
+	public Class<?> srcClass() {
+		return BiFunction.class;
+	}
+
+	@Override
+	public Class<?> targetClass() {
+		return BiComputer.class;
+	}
+
+	@Override
+	public Type[] getTransformedArgTypes(OpRef toRef) {
+		return TypeModUtils.remove(toRef.getArgs(), 2);
+	}
+
+	@Override
+	public Type[] getTransformedOutputTypes(OpRef toRef) {
+		return toRef.getOutTypes();
+	}
+}
diff --git a/src/test/java/org/scijava/ops/AutoTransformTest.java b/src/test/java/org/scijava/ops/AutoTransformTest.java
@@ -30,6 +30,7 @@
 package org.scijava.ops;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.junit.Test;
@@ -70,6 +71,17 @@ public void autoFunctionToComputer() {
 	}
 	
 	@Test
+	public void autoBiFunctionToBiComputer() {
+		BiFunction<double[], double[], double[]> addArrayFunction = ops().findOp( //
+				"add", new Nil<BiFunction<double[], double[], double[]>>() {
+				}, //
+				new Nil[] { Nil.of(double[].class), Nil.of(double[].class) }, //
+				Nil.of(double[].class)//
+		);
+		double[] res = addArrayFunction.apply(new double[]{4.0, 16.0}, new double[]{4.0, 16.0});
+		arrayEquals(res, 8.0, 32.0);
+	}
+	
 	@Test
 	public void autoLiftFuncToArray() {
 		Function<Double[], Double[]> power3ArraysFunc = ops().findOp( //
