Optimized ShrinkingDistance.forCollection(..)

Working towards #435 effects

Author: jlink

api/src/main/java/net/jqwik/api/ShrinkingDistance.java

@@ -28,11 +28,9 @@ public static ShrinkingDistance of(long... distances) {
 
 	@API(status = MAINTAINED, since = "1.0")
 	public static <T> ShrinkingDistance forCollection(Collection<Shrinkable<T>> elements) {
-		ShrinkingDistance sumDistanceOfElements = elements
-													  .stream()
-													  .map(Shrinkable::distance)
-													  .reduce(ShrinkingDistance.MIN, ShrinkingDistance::plus);
-
+		// This is an optimization to avoid creating temporary arrays, which the old streams-based implementation did.
+		long[] collectedDistances = sumUp(toDistances(elements));
+		ShrinkingDistance sumDistanceOfElements = new ShrinkingDistance(collectedDistances);
 		return ShrinkingDistance.of(elements.size()).append(sumDistanceOfElements);
 	}
 
@@ -41,9 +39,9 @@ public static <T> ShrinkingDistance combine(List<Shrinkable<T>> shrinkables) {
 		if (shrinkables.isEmpty()) {
 			throw new IllegalArgumentException("At least one shrinkable is required");
 		}
-		// This is an optimization to avoid creating many temporary arrays, which the old streams-based implementation did.
-		List<long[]> shrinkableDistances = toDistances(shrinkables);
-		long[] combinedDistances = concatenate(shrinkableDistances);
+
+		// This is an optimization to avoid creating temporary arrays, which the old streams-based implementation did.
+		long[] combinedDistances = concatenate(toDistances(shrinkables));
 		return new ShrinkingDistance(combinedDistances);
 	}
 
@@ -52,7 +50,7 @@ private ShrinkingDistance(long[] distances) {
 	}
 
 	@Override
-	public boolean equals(Object o) {
+	public boolean equals(@Nullable Object o) {
 		if (this == o) return true;
 		if (o == null || getClass() != o.getClass()) return false;
 
@@ -109,7 +107,7 @@ private int compareDimension(ShrinkingDistance other, int i) {
 
 	@API(status = INTERNAL)
 	public ShrinkingDistance plus(ShrinkingDistance other) {
-		long[] summedUpDistances = sumUp(distances, other.distances);
+		long[] summedUpDistances = sumUp(Arrays.asList(distances, other.distances));
 		return new ShrinkingDistance(summedUpDistances);
 	}
 
@@ -120,7 +118,7 @@ public ShrinkingDistance append(ShrinkingDistance other) {
 	}
 
 	@NotNull
-	private static <T> List<long[]> toDistances(List<Shrinkable<T>> shrinkables) {
+	private static <T> List<long[]> toDistances(Collection<Shrinkable<T>> shrinkables) {
 		List<long[]> listOfDistances = new ArrayList<>(shrinkables.size());
 		for (Shrinkable<?> tShrinkable : shrinkables) {
 			long[] longs = tShrinkable.distance().distances;

api/src/main/java/net/jqwik/api/support/LongArraysSupport.java

@@ -13,16 +13,24 @@ public static long at(long[] array, int i) {
 		return array.length > i ? array[i] : 0;
 	}
 
-	public static long[] sumUp(long[] left, long[] right) {
-		long[] sum = new long[Math.max(left.length, right.length)];
-		for (int i = 0; i < sum.length; i++) {
-			long summedValue = at(left, i) + at(right, i);
-			if (summedValue < 0) {
-				summedValue = Long.MAX_VALUE;
+	public static long[] sumUp(List<long[]> listOfArrays) {
+		int maxDistanceSize = listOfArrays.stream().mapToInt(s -> s.length).max().orElse(0);
+		long[] summedUpArray = new long[maxDistanceSize];
+		Arrays.fill(summedUpArray, 0);
+		for (long[] array : listOfArrays) {
+			for (int i = 0; i < summedUpArray.length; i++) {
+				summedUpArray[i] = plusWithoutOverflowAt(summedUpArray, array, i);
 			}
-			sum[i] = summedValue;
 		}
-		return sum;
+		return summedUpArray;
+	}
+
+	private static long plusWithoutOverflowAt(long[] left, long[] right, int index) {
+		long summedValue = at(right, index) + at(left, index);
+		if (summedValue < 0) {
+			return Long.MAX_VALUE;
+		}
+		return summedValue;
 	}
 
 	public static long[] concatenate(List<long[]> listOfArrays) {

engine/src/test/java/net/jqwik/engine/properties/shrinking/ShrinkingDistanceTests.java

@@ -88,8 +88,7 @@ class ForCollections {
 		@Example
 		void emptyCollection() {
 			ShrinkingDistance distance = ShrinkingDistance.forCollection(Collections.emptyList());
-			assertThat(distance).isEqualTo(ShrinkingDistance.of(0, 0));
-			assertThat(distance).isEqualByComparingTo(ShrinkingDistance.MIN);
+			assertThat(distance).isEqualTo(ShrinkingDistance.MIN);
 		}
 
 		@Example