java - refactor IterTools

Author: pareronia

src/main/java/AoC2015_01.java

@@ -1,17 +1,17 @@
 import static com.github.pareronia.aoc.AssertUtils.unreachable;
-import static com.github.pareronia.aoc.IterTools.enumerate;
+import static com.github.pareronia.aoc.itertools.IterTools.enumerate;
 import static java.util.stream.Collectors.toList;
 
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-
 import com.github.pareronia.aoc.Utils;
 import com.github.pareronia.aoc.solution.Sample;
 import com.github.pareronia.aoc.solution.Samples;
 import com.github.pareronia.aoc.solution.SolutionBase;
 
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+
 public final class AoC2015_01
         extends SolutionBase<List<AoC2015_01.Direction>, Integer, Integer> {
 
@@ -51,7 +51,7 @@ public boolean test(final Direction dir) {
                 return sum != -1;
             }
         };
-        return enumerate(input.stream())
+        return enumerate(input).stream()
             .dropWhile(e -> dropCondition.test(e.value()))
             .map(e -> e.index() + 1)
             .findFirst().orElseThrow();

src/main/java/AoC2015_09.java

@@ -3,8 +3,8 @@
 import java.util.Map;
 import java.util.stream.IntStream;
 
-import com.github.pareronia.aoc.IterTools;
 import com.github.pareronia.aoc.MutableInt;
+import com.github.pareronia.aoc.itertools.IterTools;
 import com.github.pareronia.aoc.solution.Sample;
 import com.github.pareronia.aoc.solution.Samples;
 import com.github.pareronia.aoc.solution.SolutionBase;

src/main/java/AoC2015_10.java

@@ -1,14 +1,14 @@
-import static com.github.pareronia.aoc.IterTools.enumerate;
 import static com.github.pareronia.aoc.StringOps.splitLines;
+import static com.github.pareronia.aoc.itertools.IterTools.enumerate;
 import static java.util.stream.Collectors.toMap;
 
+import com.github.pareronia.aoc.itertools.Enumerated;
+import com.github.pareronia.aoc.solution.SolutionBase;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import com.github.pareronia.aoc.IterTools.Enumerated;
-import com.github.pareronia.aoc.solution.SolutionBase;
-
 public class AoC2015_10 extends SolutionBase<AoC2015_10.Input, Integer, Integer> {
 
     private AoC2015_10(final boolean debug) {
@@ -28,11 +28,11 @@ protected Input parseInput(final List<String> inputs) {
         final List<String[]> elements = splitLines(ELEMENTS).stream()
             .map(s -> s.split(" "))
             .toList();
-        final Map<String, Integer> indices = enumerate(elements.stream())
+        final Map<String, Integer> indices = enumerate(elements).stream()
             .collect(toMap(e -> e.value()[2], Enumerated::index));
         final String[] sequence = new String[N];
         final int[][] decays = new int[N][];
-        enumerate(elements.stream()).forEach(e -> {
+        enumerate(elements.stream()).stream().forEach(e -> {
             sequence[e.index()] = e.value()[0];
             decays[e.index()] = Arrays.stream(e.value())
                     .skip(4).mapToInt(indices::get).toArray();

src/main/java/AoC2015_13.java

@@ -3,8 +3,8 @@
 import java.util.Map;
 import java.util.stream.IntStream;
 
-import com.github.pareronia.aoc.IterTools;
 import com.github.pareronia.aoc.MutableInt;
+import com.github.pareronia.aoc.itertools.IterTools;
 import com.github.pareronia.aoc.solution.Sample;
 import com.github.pareronia.aoc.solution.Samples;
 import com.github.pareronia.aoc.solution.SolutionBase;

src/main/java/AoC2015_17.java

@@ -1,5 +1,5 @@
-import static com.github.pareronia.aoc.IterTools.combinations;
 import static com.github.pareronia.aoc.StringOps.splitLines;
+import static com.github.pareronia.aoc.itertools.IterTools.combinations;
 import static java.util.Comparator.reverseOrder;
 import static java.util.stream.Collectors.toList;
 

src/main/java/AoC2015_21.java

@@ -1,4 +1,4 @@
-import static com.github.pareronia.aoc.IterTools.combinations;
+import static com.github.pareronia.aoc.itertools.IterTools.combinations;
 import static java.util.Collections.singleton;
 import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.toList;

src/main/java/AoC2016_08.java

@@ -8,9 +8,9 @@
 
 import com.github.pareronia.aoc.CharGrid;
 import com.github.pareronia.aoc.Grid.Cell;
-import com.github.pareronia.aoc.IterTools;
 import com.github.pareronia.aoc.OCR;
 import com.github.pareronia.aoc.StringOps.StringSplit;
+import com.github.pareronia.aoc.itertools.IterTools;
 import com.github.pareronia.aoc.StringUtils;
 import com.github.pareronia.aoc.solution.SolutionBase;
 

src/main/java/AoC2016_11.java

@@ -1,5 +1,5 @@
 import static com.github.pareronia.aoc.AssertUtils.unreachable;
-import static com.github.pareronia.aoc.IterTools.combinations;
+import static com.github.pareronia.aoc.itertools.IterTools.combinations;
 import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toList;

src/main/java/AoC2016_24.java

@@ -1,11 +1,10 @@
-import static com.github.pareronia.aoc.IterTools.combinations;
-
+import static com.github.pareronia.aoc.itertools.IterTools.combinations;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 
 import com.github.pareronia.aoc.CharGrid;
 import com.github.pareronia.aoc.Grid.Cell;
-import com.github.pareronia.aoc.IterTools;
+import com.github.pareronia.aoc.itertools.IterTools;
 import com.github.pareronia.aoc.StringOps;
 import com.github.pareronia.aoc.solution.Sample;
 import com.github.pareronia.aoc.solution.Samples;

src/main/java/AoC2017_02.java

@@ -1,4 +1,4 @@
-import static com.github.pareronia.aoc.IterTools.combinations;
+import static com.github.pareronia.aoc.itertools.IterTools.combinations;
 
 import com.github.pareronia.aoc.AssertUtils;
 import com.github.pareronia.aoc.solution.Sample;