Small refactoring

Author: SimonBaars

src/main/java/com/sbaars/adventofcode/year20/days/Day6.java

@@ -6,6 +6,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static java.util.Arrays.stream;
 import static java.util.stream.Collectors.toCollection;
 import static java.util.stream.IntStream.range;
 
@@ -21,14 +22,15 @@ public static void main(String[] args) {
 
   @Override
   public Object part1() {
-    return Arrays.stream(day().split("\n\n"))
-        .map(i -> i.replace("\n", ""))
-        .mapToLong(i -> i.chars().distinct().count()).sum();
+    return dayStream("\n\n")
+            .map(s -> s.replace("\n", ""))
+            .mapToLong(s -> s.chars().distinct().count())
+            .sum();
   }
 
   @Override
   public Object part2() {
-    return Arrays.stream(day().split("\n\n")).mapToInt(group -> {
+    return stream(day().split("\n\n")).mapToInt(group -> {
       String[] people = group.split("\n");
       List<Integer> c = people[0].chars().boxed().collect(toCollection(ArrayList::new));
       range(1, people.length).forEach(i -> c.retainAll(people[i].chars().boxed().toList()));

src/main/java/com/sbaars/adventofcode/year22/days/Day1.java

@@ -5,6 +5,8 @@
 import java.util.Arrays;
 import java.util.stream.LongStream;
 
+import static java.util.Arrays.stream;
+
 public class Day1 extends Day2022 {
   public Day1() {
     super(1);
@@ -26,6 +28,6 @@ public Object part2() {
   }
 
   private LongStream input() {
-    return dayStream("\n\n").mapToLong(s -> Arrays.stream(s.split("\n")).mapToLong(Long::parseLong).sum());
+    return dayStream("\n\n").mapToLong(s -> stream(s.split("\n")).mapToLong(Long::parseLong).sum());
   }
 }

src/main/java/com/sbaars/adventofcode/year22/days/Day21.java

@@ -14,6 +14,7 @@
 import static com.sbaars.adventofcode.util.DataMapper.readString;
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
+import static java.util.stream.LongStream.range;
 
 public class Day21 extends Day2022 {
   public Day21() {
@@ -40,7 +41,7 @@ public Object part1() {
   @Override
   public Object part2() {
     Map<String, Object> in = input();
-    long[] valid = LongStream.range(0, Long.MAX_VALUE).filter(i -> diff(in, new long[]{}, i) != Long.MAX_VALUE).limit(2).toArray();
+    long[] valid = range(0, Long.MAX_VALUE).filter(i -> diff(in, new long[]{}, i) != Long.MAX_VALUE).limit(2).toArray();
     return (binarySearch(i -> diff(in, valid, i), valid[0], Long.MAX_VALUE / (valid[1] - valid[0])) * (valid[1] - valid[0])) + valid[0];
   }
 

src/main/java/com/sbaars/adventofcode/year23/days/Day1.java

@@ -8,6 +8,8 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import static java.util.stream.IntStream.range;
+
 public class Day1 extends Day2023 {
   private static final Map<String, Integer> nums = Map.of("one", 1, "two", 2, "three", 3, "four", 4, "five", 5, "six", 6, "seven", 7, "eight", 8, "nine", 9);
 
@@ -33,7 +35,7 @@ private Pair<Integer, String> lastDigit(String s) {
   }
 
   private static Stream<Pair<Integer, String>> pairStream(String s) {
-    return IntStream.range(0, s.length()).mapToObj(i -> Pair.of(i, s.charAt(i) + "")).filter(x -> Character.isDigit(x.getRight().charAt(0)));
+    return range(0, s.length()).mapToObj(i -> Pair.of(i, s.charAt(i) + "")).filter(x -> Character.isDigit(x.getRight().charAt(0)));
   }
 
   @Override

src/main/java/com/sbaars/adventofcode/year23/days/Day7.java

@@ -3,7 +3,10 @@
 import com.sbaars.adventofcode.common.map.CountMap;
 import com.sbaars.adventofcode.year23.Day2023;
 
+import java.util.Comparator;
+
 import static com.sbaars.adventofcode.util.AOCUtils.zip;
+import static com.sbaars.adventofcode.util.AOCUtils.zipWithIndex;
 import static com.sbaars.adventofcode.util.DataMapper.readString;
 import static java.util.stream.IntStream.range;
 
@@ -22,12 +25,18 @@ public record Hand(String cards, int bet) {
 
     @Override
     public Object part1() {
-        return zip(dayStream().map(s -> readString(s, "%s %i", Hand.class)).sorted(this::compareHands), range(1, Integer.MAX_VALUE).boxed()).mapToLong(p -> (long) p.a().bet * p.b()).sum();
+        return solve(this::compareHands);
     }
 
     @Override
     public Object part2() {
-        return zip(dayStream().map(s -> readString(s, "%s %i", Hand.class)).sorted(this::compareHands2), range(1, Integer.MAX_VALUE).boxed()).mapToLong(p -> (long) p.a().bet * p.b()).sum();
+        return solve(this::compareHands2);
+    }
+
+    private long solve(Comparator<Hand> comparator) {
+        return zipWithIndex(
+                dayStream().map(s -> readString(s, "%s %i", Hand.class)).sorted(comparator)
+                ).mapToLong(hand -> (long) hand.e().bet * (hand.i() + 1)).sum();
     }
 
     public int compareHands(Hand h1, Hand h2) {