Rename BiInplace1/2 to BiInplaceFirst/Second

gselzer · ctrueden · commit c6f3e656f849 · 2019-06-11T12:22:51.000-05:00
diff --git a/src/main/java/org/scijava/ops/core/inplace/BiInplaceFirst.java b/src/main/java/org/scijava/ops/core/inplace/BiInplaceFirst.java
@@ -5,7 +5,7 @@
 import org.scijava.param.Mutable;
 
 @FunctionalInterface
-public interface BiInplace1<IO, I2> extends BiConsumer<IO, I2> {
+public interface BiInplaceFirst<IO, I2> extends BiConsumer<IO, I2> {
 	void mutate(@Mutable IO io, I2 in2);
 
 	@Override
diff --git a/src/main/java/org/scijava/ops/core/inplace/BiInplaceSecond.java b/src/main/java/org/scijava/ops/core/inplace/BiInplaceSecond.java
@@ -5,7 +5,7 @@
 import org.scijava.param.Mutable;
 
 @FunctionalInterface
-public interface BiInplace2<I1, IO> extends BiConsumer<I1, IO> {
+public interface BiInplaceSecond<I1, IO> extends BiConsumer<I1, IO> {
 	void mutate(I1 in1, @Mutable IO io);
 
 	@Override
diff --git a/src/main/java/org/scijava/ops/math/Add.java b/src/main/java/org/scijava/ops/math/Add.java
@@ -11,7 +11,7 @@
 import org.scijava.core.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.core.computer.BiComputer;
-import org.scijava.ops.core.inplace.BiInplace1;
+import org.scijava.ops.core.inplace.BiInplaceFirst;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
@@ -93,7 +93,7 @@ public void compute(double[] in1, double[] in2, double[] out) {
 	@Plugin(type = Op.class, name = NAMES)
 	@Parameter(key = "arrayIO", type = ItemIO.BOTH)
 	@Parameter(key = "array1")
-	public static class MathPointwiseAddDoubleArraysInplace1 implements BiInplace1<double[], double[]> {
+	public static class MathPointwiseAddDoubleArraysInplace1 implements BiInplaceFirst<double[], double[]> {
 		@Override
 		public void mutate(double[] io, double[] in2) {
 			for (int i = 0; i < io.length; i++ ) {
diff --git a/src/main/java/org/scijava/ops/util/Inplaces.java b/src/main/java/org/scijava/ops/util/Inplaces.java
@@ -4,8 +4,8 @@
 
 import org.scijava.ops.OpService;
 import org.scijava.ops.core.Op;
-import org.scijava.ops.core.inplace.BiInplace1;
-import org.scijava.ops.core.inplace.BiInplace2;
+import org.scijava.ops.core.inplace.BiInplaceFirst;
+import org.scijava.ops.core.inplace.BiInplaceSecond;
 import org.scijava.ops.core.inplace.Inplace;
 import org.scijava.ops.core.inplace.Inplace3First;
 import org.scijava.ops.core.inplace.Inplace3Second;
@@ -55,13 +55,13 @@ public Type getType() {
 				secondaryArgs);
 	}
 
-	public static <IO, I2> BiInplace1<IO, I2> binary1(final OpService ops, final String opName,
+	public static <IO, I2> BiInplaceFirst<IO, I2> binary1(final OpService ops, final String opName,
 			final Nil<IO> inputOutputType, final Nil<I2> input2Type, final Object... secondaryArgs) {
 
-		Nil<BiInplace1<IO, I2>> inplaceNil = new Nil<BiInplace1<IO, I2>>() {
+		Nil<BiInplaceFirst<IO, I2>> inplaceNil = new Nil<BiInplaceFirst<IO, I2>>() {
 			@Override
 			public Type getType() {
-				return Types.parameterize(BiInplace1.class,
+				return Types.parameterize(BiInplaceFirst.class,
 						new Type[] { inputOutputType.getType(), input2Type.getType() });
 			}
 		};
@@ -74,13 +74,13 @@ public Type getType() {
 				secondaryArgs);
 	}
 
-	public static <I1, IO> BiInplace2<I1, IO> binary2(final OpService ops, final String opName,
+	public static <I1, IO> BiInplaceSecond<I1, IO> binary2(final OpService ops, final String opName,
 			final Nil<I1> input1Type, final Nil<IO> inputOutputType, final Object... secondaryArgs) {
 
-		Nil<BiInplace2<I1, IO>> inplaceNil = new Nil<BiInplace2<I1, IO>>() {
+		Nil<BiInplaceSecond<I1, IO>> inplaceNil = new Nil<BiInplaceSecond<I1, IO>>() {
 			@Override
 			public Type getType() {
-				return Types.parameterize(BiInplace2.class,
+				return Types.parameterize(BiInplaceSecond.class,
 						new Type[] { input1Type.getType(), inputOutputType.getType() });
 			}
 		};
diff --git a/src/test/java/org/scijava/ops/InplacesTest.java b/src/test/java/org/scijava/ops/InplacesTest.java
@@ -30,7 +30,7 @@
 package org.scijava.ops;
 
 import org.junit.Test;
-import org.scijava.ops.core.inplace.BiInplace1;
+import org.scijava.ops.core.inplace.BiInplaceFirst;
 import org.scijava.ops.core.inplace.Inplace;
 import org.scijava.ops.util.Inplaces;
 import org.scijava.ops.types.Nil;
@@ -50,7 +50,7 @@ public void testUnaryInplaces() {
 
 	@Test
 	public void testBinaryInplaces() {
-		final BiInplace1<double[], double[]> inplaceAdd = Inplaces.binary1(ops(), "math.add", nilDoubleArray,
+		final BiInplaceFirst<double[], double[]> inplaceAdd = Inplaces.binary1(ops(), "math.add", nilDoubleArray,
 				nilDoubleArray);
 		final double[] a1 = { 3, 5, 7 };
 		final double[] a2 = { 2, 4, 9 };
diff --git a/src/test/java/org/scijava/ops/OpsTest.java b/src/test/java/org/scijava/ops/OpsTest.java
@@ -39,7 +39,7 @@
 import org.scijava.ops.core.computer.BiComputer;
 import org.scijava.ops.core.computer.Computer;
 import org.scijava.ops.core.computer.NullaryComputer;
-import org.scijava.ops.core.inplace.BiInplace1;
+import org.scijava.ops.core.inplace.BiInplaceFirst;
 import org.scijava.ops.core.inplace.Inplace;
 import org.scijava.ops.types.Nil;
 
@@ -132,8 +132,8 @@ public void unaryInplace() {
 
 	@Test
 	public void binaryInplace() {
-		BiInplace1<double[], double[]> inplaceAdd = ops().findOp( //
-				"math.add", new Nil<BiInplace1<double[], double[]>>() {
+		BiInplaceFirst<double[], double[]> inplaceAdd = ops().findOp( //
+				"math.add", new Nil<BiInplaceFirst<double[], double[]>>() {
 				}, //
 				new Nil[] { nilDoubleArray, nilDoubleArray }, //
 				nilDoubleArray//
