Write a better list converter

gselzer · gselzer · commit 28fcec020560 · 2024-03-20T13:08:51.000-05:00
diff --git a/scijava-ops-engine/src/main/java/module-info.java b/scijava-ops-engine/src/main/java/module-info.java
@@ -290,6 +290,7 @@
 		org.scijava.ops.engine.math.Power,
 		org.scijava.ops.engine.math.Sqrt,
 		org.scijava.ops.engine.math.Zero,
+		org.scijava.ops.engine.matcher.convert.ListConverterCollection,
 		org.scijava.ops.engine.matcher.convert.PrimitiveArrayConverters,
 		org.scijava.ops.engine.matcher.convert.PrimitiveConverters,
 		org.scijava.ops.engine.stats.Mean,
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/convert/ListConverterCollection.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/convert/ListConverterCollection.java
@@ -29,31 +29,35 @@
 
 package org.scijava.ops.engine.matcher.convert;
 
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpMethod;
+import org.scijava.priority.Priority;
+
 import java.util.List;
 import java.util.function.Function;
-
-import org.scijava.ops.spi.Op;
-import org.scijava.ops.spi.OpClass;
+import java.util.stream.Collectors;
 
 /**
  * Converts {@link List}s of types extending {@link Number}.
  *
  * @author Gabriel Selzer
  */
-@OpClass(names = "engine.convert")
-public class PrimitiveListConverter<T extends Number> implements
-	Function<List<T>, List<Number>>, Op
-{
+public class ListConverterCollection implements OpCollection {
 
-	@Override
 	/**
 	 * @param t the input List
 	 * @return a List whose elements have been converted
 	 */
-	public List<Number> apply(List<T> t) {
-		@SuppressWarnings({ "unchecked", "rawtypes" })
-		List<Number> numberList = (List) t;
-		return numberList;
+	@OpMethod( //
+		names = "engine.convert", //
+		type = Function.class, //
+		priority = Priority.LOW //
+	)
+	public static <T, U> List<U> convert(@OpDependency(
+		name = "engine.convert") Function<T, U> elementConverter, List<T> t)
+	{
+		return t.stream().map(elementConverter).collect(Collectors.toList());
 	}
 
 }
diff --git a/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ServiceLoaderDiscoveryIntegrationTest.java b/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ServiceLoaderDiscoveryIntegrationTest.java
@@ -61,13 +61,13 @@ public void opDiscoveryRegressionIT() {
 	public void opCollectionDiscoveryRegressionIT() {
 		final Discoverer d = Discoverer.using(ServiceLoader::load);
 		final List<OpCollection> discoveries = d.discover(OpCollection.class);
-		Assertions.assertEquals(21, discoveries.size());
+		Assertions.assertEquals(22, discoveries.size());
 		@SuppressWarnings("unused")
 		final OpInfoGenerator g = new OpCollectionInfoGenerator();
 		final List<OpInfo> infos = discoveries.stream() //
 			.flatMap(c -> g.generateInfosFrom(c).stream()) //
 			.collect(Collectors.toList());
-		Assertions.assertEquals(299, infos.size());
+		Assertions.assertEquals(300, infos.size());
 	}
 
 }
diff --git a/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/convert/PrimitiveListConverterTest.java b/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/convert/PrimitiveListConverterTest.java
@@ -34,33 +34,44 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.types.Nil;
 
-public class PrimitiveListConverterTest {
+public class PrimitiveListConverterTest extends AbstractTestEnvironment
+	implements OpCollection
+{
 
-	@Test
-	public void testLinkedListConverter() {
-		List<Long> list = new LinkedList<>();
-		list.add(5l);
-		PrimitiveListConverter<Long> converter = new PrimitiveListConverter<>();
-		List<Number> newList = converter.apply(list);
-		assertTrue(newList instanceof LinkedList);
-		assertFalse(newList instanceof ArrayList);
-		assertEquals(newList.get(0), 5l);
+	@BeforeAll
+	public static void addNeededOps() {
+		ops.register(new PrimitiveListConverterTest(),
+			new ListConverterCollection(), new PrimitiveConverters<>(),
+			new IdentityCollection<>());
 	}
 
+	@OpField(names = "test.listConversion")
+	public final Function<List<Integer>, List<Integer>> foo = (in) -> in.stream()
+		.map(i -> i * 2 + 1).collect(Collectors.toList());
+
 	@Test
-	public void testArrayListConverter() {
-		List<Long> list = new ArrayList<>();
-		list.add(5l);
-		PrimitiveListConverter<Long> converter = new PrimitiveListConverter<>();
-		List<Number> newList = converter.apply(list);
-		assertFalse(newList instanceof LinkedList);
-		assertTrue(newList instanceof ArrayList);
-		assertEquals(newList.get(0), 5l);
+	public void testLinkedListConverter() {
+		var outNil = new Nil<List<Integer>>() {};
+		var in = Arrays.asList(1.0, 2.0);
+		var out = ops.unary("test.listConversion").input(in).outType(outNil)
+			.apply();
+		for (int i = 0; i < in.size(); i++) {
+			Assertions.assertEquals(in.get(i) * 2 + 1, (double) out.get(i));
+		}
 	}
-
 }
diff --git a/scijava-ops-engine/templates/main/java/module-info.vm b/scijava-ops-engine/templates/main/java/module-info.vm
@@ -133,6 +133,7 @@ module org.scijava.ops.engine {
 		org.scijava.ops.engine.math.Power,
 		org.scijava.ops.engine.math.Sqrt,
 		org.scijava.ops.engine.math.Zero,
+		org.scijava.ops.engine.matcher.convert.ListConverterCollection,
 		org.scijava.ops.engine.matcher.convert.PrimitiveArrayConverters,
 		org.scijava.ops.engine.matcher.convert.PrimitiveConverters,
 		org.scijava.ops.engine.stats.Mean,
diff --git a/scijava-ops-image/src/test/java/org/scijava/ops/image/OpRegressionTest.java b/scijava-ops-image/src/test/java/org/scijava/ops/image/OpRegressionTest.java
@@ -42,7 +42,7 @@ public class OpRegressionTest {
 
 	@Test
 	public void opDiscoveryRegressionIT() {
-		long expected = 1911;
+		long expected = 1912;
 		long actual = ops.infos().size();
 		assertEquals(expected, actual);
 	}

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public class OpRegressionTest {`
`42`	`42`
`43`	`43`	`@Test`
`44`	`44`	`public void opDiscoveryRegressionIT() {`
`45`		`- long expected = 1911;`
	`45`	`+ long expected = 1912;`
`46`	`46`	`long actual = ops.infos().size();`
`47`	`47`	`assertEquals(expected, actual);`
`48`	`48`	`}`