Rename AoCUtils

Author: SimonBaars

src/main/java/com/sbaars/adventofcode/util/AOCUtils.java renamed to src/main/java/com/sbaars/adventofcode/util/AoCUtils.java

@@ -12,7 +12,7 @@
 import static java.lang.Long.MAX_VALUE;
 import static java.util.stream.IntStream.range;
 
-public class AOCUtils {
+public class AoCUtils {
   public static void verify(boolean b) {
     verify(b, "Something went wrong");
   }

src/main/java/com/sbaars/adventofcode/util/DataMapper.java

@@ -9,7 +9,7 @@
 import java.util.stream.Collectors;
 
 import static com.sbaars.adventofcode.common.Tuple.of;
-import static com.sbaars.adventofcode.util.AOCUtils.verify;
+import static com.sbaars.adventofcode.util.AoCUtils.verify;
 import static java.lang.Double.parseDouble;
 import static java.lang.Integer.parseInt;
 import static java.lang.Long.parseLong;
@@ -39,7 +39,7 @@ static <T> T readString(String s, String pattern, String[] listSeparator, Class<
       if (pattern.length() > 1 && pattern.charAt(0) == '%') {
         char c = pattern.charAt(1);
         Class<?> mapList = null;
-        if(c == 'l' && pattern.charAt(2) == '(') {
+        if (c == 'l' && pattern.charAt(2) == '(') {
           verify(nested.length > 0, "Please specify the class that will contain the objects of the list.");
           mapList = nested[listIndex % nested.length];
         }
@@ -61,7 +61,7 @@ static <T> T readString(String s, String pattern, String[] listSeparator, Class<
         throw new IllegalStateException("Illegal crunch, pattern = " + pattern + " and s = " + s);
       }
     }
-    if(pattern.startsWith("%l")) mappedObjs.add(new ArrayList<>());
+    if (pattern.startsWith("%l")) mappedObjs.add(new ArrayList<>());
     try {
       verify(target.getConstructors().length > 0, "Class " + target + " has no constructor!");
       verify(stream(target.getConstructors()).anyMatch(c -> c.getParameterCount() == mappedObjs.size()), "Class " + target + " has no constructor of size " + mappedObjs.size() + "!");

src/main/java/com/sbaars/adventofcode/util/Solver.java

@@ -8,7 +8,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.sbaars.adventofcode.util.AOCUtils.connectedPairs;
+import static com.sbaars.adventofcode.util.AoCUtils.connectedPairs;
 
 /**
  * The solver looks for patterns in an infinite stream of numeric data, to find the result further in the repetition.

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

@@ -2,8 +2,8 @@
 
 import com.sbaars.adventofcode.year15.Day2015;
 
-import static com.sbaars.adventofcode.util.AOCUtils.findReduce;
-import static com.sbaars.adventofcode.util.AOCUtils.zipWithIndex;
+import static com.sbaars.adventofcode.util.AoCUtils.findReduce;
+import static com.sbaars.adventofcode.util.AoCUtils.zipWithIndex;
 
 public class Day1 extends Day2015 {
   public Day1() {

src/main/java/com/sbaars/adventofcode/year15/days/Day3.java

@@ -5,7 +5,7 @@
 import com.sbaars.adventofcode.year15.Day2015;
 
 import static com.sbaars.adventofcode.common.Direction.*;
-import static com.sbaars.adventofcode.util.AOCUtils.zipWithIndex;
+import static com.sbaars.adventofcode.util.AoCUtils.zipWithIndex;
 
 public class Day3 extends Day2015 {
   public Day3() {

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

@@ -6,7 +6,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static com.sbaars.adventofcode.util.AOCUtils.fixedPoint;
+import static com.sbaars.adventofcode.util.AoCUtils.fixedPoint;
 import static com.sbaars.adventofcode.util.DataMapper.readString;
 import static java.lang.Integer.parseInt;
 import static java.util.Optional.empty;

src/main/java/com/sbaars/adventofcode/year18/days/Day12.java

@@ -8,8 +8,7 @@
 import java.util.stream.Stream;
 
 import static com.sbaars.adventofcode.common.SmartArray.toSmartArray;
-import static com.sbaars.adventofcode.util.AOCUtils.connectedPairs;
-import static com.sbaars.adventofcode.util.AOCUtils.zip;
+import static com.sbaars.adventofcode.util.AoCUtils.zip;
 import static com.sbaars.adventofcode.util.DataMapper.readString;
 import static com.sbaars.adventofcode.util.Solver.solve;
 import static java.util.stream.IntStream.range;
@@ -24,8 +23,11 @@ public static void main(String[] args) {
     new Day12().printParts();
   }
 
-  public record Input(String initial, List<Note> notes) {}
-  public record Note(String adjecent, char c) {}
+  public record Input(String initial, List<Note> notes) {
+  }
+
+  public record Note(String adjecent, char c) {
+  }
 
   @Override
   public Object part1() {
@@ -44,17 +46,17 @@ private static ToLongFunction<SmartArray<Integer>> sum() {
   private Stream<SmartArray<Integer>> growth() {
     Input in = readString(day(), "initial state: %s\n\n%l(%s => %c)", "\n", Input.class, Note.class);
     var plants = range(0, in.initial.length()).filter(i -> in.initial.charAt(i) == '#').boxed().collect(toSmartArray());
-    return Stream.iterate(plants, p -> range(p.get(0) - 2, p.get(p.size() -1) + 2)
-                    .filter(i -> plantGrows(in.notes, p, i))
-                    .boxed().collect(toSmartArray()));
+    return Stream.iterate(plants, p -> range(p.get(0) - 2, p.get(p.size() - 1) + 2)
+        .filter(i -> plantGrows(in.notes, p, i))
+        .boxed().collect(toSmartArray()));
   }
 
   private boolean plantGrows(List<Note> notes, SmartArray<Integer> arr, int i) {
     return notes
-            .stream()
-            .filter(n -> zip(n.adjecent.chars().boxed(), rangeClosed(-2, 2).boxed()).allMatch(e -> (e.a() == '#') == arr.contains(i+e.b())))
-            .map(n -> n.c == '#')
-            .findFirst()
-            .orElse(false);
+        .stream()
+        .filter(n -> zip(n.adjecent.chars().boxed(), rangeClosed(-2, 2).boxed()).allMatch(e -> (e.a() == '#') == arr.contains(i + e.b())))
+        .map(n -> n.c == '#')
+        .findFirst()
+        .orElse(false);
   }
 }

src/main/java/com/sbaars/adventofcode/year18/days/Day2.java

@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import static com.sbaars.adventofcode.util.AOCUtils.allPairs;
+import static com.sbaars.adventofcode.util.AoCUtils.allPairs;
 import static java.util.Optional.empty;
 
 public class Day2 extends Day2018 {

src/main/java/com/sbaars/adventofcode/year18/days/Day4.java

@@ -10,7 +10,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static com.sbaars.adventofcode.util.AOCUtils.findMax;
+import static com.sbaars.adventofcode.util.AoCUtils.findMax;
 import static com.sbaars.adventofcode.util.DataMapper.readString;
 
 public class Day4 extends Day2018 {

src/main/java/com/sbaars/adventofcode/year18/days/Day5.java

@@ -3,13 +3,13 @@
 import com.sbaars.adventofcode.common.Pair;
 import com.sbaars.adventofcode.year18.Day2018;
 
-import static com.sbaars.adventofcode.util.AOCUtils.*;
+import static com.sbaars.adventofcode.util.AoCUtils.*;
 import static java.lang.Math.abs;
 import static java.util.stream.IntStream.range;
 
 public class Day5 extends Day2018 {
 
-  private static int DIFF = 'a' - 'A';
+  private static final int DIFF = 'a' - 'A';
 
   public Day5() {
     super(5);

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

@@ -13,7 +13,7 @@
 
 import static com.sbaars.adventofcode.common.grid.InfiniteGrid.toInfiniteGrid;
 import static com.sbaars.adventofcode.common.map.ListMap.toListMap;
-import static com.sbaars.adventofcode.util.AOCUtils.zip;
+import static com.sbaars.adventofcode.util.AoCUtils.zip;
 import static com.sbaars.adventofcode.util.DataMapper.readString;
 import static java.util.stream.IntStream.range;
 

src/main/java/com/sbaars/adventofcode/year21/days/Day23.java

@@ -7,7 +7,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static com.sbaars.adventofcode.util.AOCUtils.verify;
+import static com.sbaars.adventofcode.util.AoCUtils.verify;
 
 public class Day23 extends Day2021 {
   public Day23() {
@@ -98,7 +98,6 @@ public State(int[][] rooms, int[] waiting) {
 
     public State copy(long newEnergy) {
       int[][] room = Arrays.stream(rooms).map(int[]::clone).toArray(int[][]::new);
-      ;
       int[] wait = Arrays.copyOf(waiting, waiting.length);
       return new State(room, wait, energySpent + newEnergy, moves + 1);
     }

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

@@ -4,7 +4,7 @@
 import com.sbaars.adventofcode.common.location.Loc;
 import com.sbaars.adventofcode.common.location.MutableLoc;
 import com.sbaars.adventofcode.common.location.Range;
-import com.sbaars.adventofcode.util.AOCUtils;
+import com.sbaars.adventofcode.util.AoCUtils;
 import com.sbaars.adventofcode.year22.Day2022;
 
 import java.util.ArrayList;
@@ -53,7 +53,7 @@ public int amountOfSand(boolean part1) {
   private static InfiniteGrid constructWalls(List<Path> paths) {
     return paths.stream()
         .map(Path::locs)
-        .flatMap(AOCUtils::connectedPairs)
+        .flatMap(AoCUtils::connectedPairs)
         .map(Range::new)
         .flatMap(Range::stream)
         .collect(toInfiniteGrid('#'));

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

@@ -10,7 +10,7 @@
 
 import static com.sbaars.adventofcode.common.Direction.fourDirections;
 import static com.sbaars.adventofcode.common.grid.InfiniteGrid.toInfiniteGrid;
-import static com.sbaars.adventofcode.util.AOCUtils.allPairs;
+import static com.sbaars.adventofcode.util.AoCUtils.allPairs;
 import static com.sbaars.adventofcode.util.DataMapper.readString;
 import static java.util.Arrays.stream;
 

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

@@ -5,7 +5,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.sbaars.adventofcode.util.AOCUtils.allPairs;
+import static com.sbaars.adventofcode.util.AoCUtils.allPairs;
 import static com.sbaars.adventofcode.util.DataMapper.readString;
 import static java.util.List.of;
 

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

@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-import static com.sbaars.adventofcode.util.AOCUtils.zipWithIndex;
+import static com.sbaars.adventofcode.util.AoCUtils.zipWithIndex;
 import static com.sbaars.adventofcode.util.DataMapper.readString;
 import static java.util.Comparator.comparing;
 

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

@@ -8,9 +8,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.LongStream;
 
-import static com.sbaars.adventofcode.util.AOCUtils.*;
+import static com.sbaars.adventofcode.util.AoCUtils.*;
 import static com.sbaars.adventofcode.util.DataMapper.readString;
 import static java.util.Optional.empty;
 import static java.util.Optional.of;

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

@@ -14,7 +14,7 @@
 import java.util.stream.Stream;
 
 import static com.sbaars.adventofcode.common.Direction.*;
-import static com.sbaars.adventofcode.util.AOCUtils.alternating;
+import static com.sbaars.adventofcode.util.AoCUtils.alternating;
 import static java.util.stream.IntStream.range;
 
 public class Day22 extends Day2022 {
@@ -112,7 +112,7 @@ private Me moveCubic(Me me) {
   }
 
   private Range square(int x, int y) {
-    Loc a = new Loc(x * CUBE_SIZE, y * CUBE_SIZE);
+    Loc a = new Loc((long) x * CUBE_SIZE, (long) y * CUBE_SIZE);
     return new Range(a, new Loc(a.x + CUBE_SIZE - 1, a.y + CUBE_SIZE - 1));
   }
 }

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

@@ -10,7 +10,7 @@
 import java.util.Set;
 import java.util.function.Function;
 
-import static com.sbaars.adventofcode.util.AOCUtils.allPairs;
+import static com.sbaars.adventofcode.util.AoCUtils.allPairs;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static java.util.stream.Collectors.toSet;

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

@@ -7,8 +7,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.sbaars.adventofcode.util.AOCUtils.connectedPairs;
-import static com.sbaars.adventofcode.util.AOCUtils.zip;
+import static com.sbaars.adventofcode.util.AoCUtils.connectedPairs;
+import static com.sbaars.adventofcode.util.AoCUtils.zip;
 import static java.util.Arrays.stream;
 import static java.util.stream.LongStream.range;
 

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

@@ -9,7 +9,7 @@
 import java.util.List;
 
 import static com.sbaars.adventofcode.common.Direction.*;
-import static com.sbaars.adventofcode.util.AOCUtils.connectedPairs;
+import static com.sbaars.adventofcode.util.AoCUtils.connectedPairs;
 import static com.sbaars.adventofcode.util.DataMapper.readString;
 
 public class Day18 extends Day2023 {

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

@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.stream.LongStream;
 
-import static com.sbaars.adventofcode.util.AOCUtils.pairs;
+import static com.sbaars.adventofcode.util.AoCUtils.pairs;
 import static com.sbaars.adventofcode.util.DataMapper.readString;
 
 public class Day5 extends Day2023 {
@@ -21,8 +21,11 @@ public static void main(String[] args) {
     new Day5().printParts();
   }
 
-  public record Mapping(String source, String dest, List<SeedNumbers> nums) {}
-  public record SeedNumbers(long destinationStart, long sourceStart, long size) {}
+  public record Mapping(String source, String dest, List<SeedNumbers> nums) {
+  }
+
+  public record SeedNumbers(long destinationStart, long sourceStart, long size) {
+  }
 
   @Override
   public Object part1() {
@@ -38,8 +41,8 @@ private ArrayList<Long> getSeeds(String[] day) {
 
   private long findLocations(String[] day, List<Mapping> mappings, long seed) {
     return mappings
-            .stream()
-            .reduce(seed, (s, m) -> m.nums.stream().map(n -> new Loc(n.sourceStart, n.sourceStart + n.size - 1).contains(s) ? s + (n.destinationStart - n.sourceStart) : -1).filter(n -> n != -1).findAny().orElse(s), Long::sum);
+        .stream()
+        .reduce(seed, (s, m) -> m.nums.stream().map(n -> new Loc(n.sourceStart, n.sourceStart + n.size - 1).contains(s) ? s + (n.destinationStart - n.sourceStart) : -1).filter(n -> n != -1).findAny().orElse(s), Long::sum);
   }
 
   private static List<Mapping> mappings(String[] day) {

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

@@ -1,12 +1,9 @@
 package com.sbaars.adventofcode.year23.days;
 
-import com.sbaars.adventofcode.util.AOCUtils;
 import com.sbaars.adventofcode.year23.Day2023;
 
 import java.util.List;
-import java.util.stream.IntStream;
 
-import static com.sbaars.adventofcode.util.AOCUtils.zip;
 import static com.sbaars.adventofcode.util.DataMapper.readString;
 import static java.util.stream.IntStream.range;
 import static java.util.stream.IntStream.rangeClosed;
@@ -21,23 +18,25 @@ public static void main(String[] args) {
     new Day6().printParts();
   }
 
-  public record Results(List<Integer> time, List<Integer> distance) {}
+  public record Results(List<Integer> time, List<Integer> distance) {
+  }
 
   @Override
   public Object part1() {
     Results in = readString(day().replaceAll(" +", " "), "Time: %li\nDistance: %li", " ", Results.class);
     return range(0, in.time.size())
-            .mapToLong(i -> countWays(in.time.get(i), in.distance.get(i)))
-            .reduce(1, (a, b) -> a * b);
+        .mapToLong(i -> countWays(in.time.get(i), in.distance.get(i)))
+        .reduce(1, (a, b) -> a * b);
   }
 
   private static long countWays(int time, long distance) {
     return rangeClosed(0, time)
-            .filter(holdTime -> (long)holdTime * (time - holdTime) > distance)
-            .count();
+        .filter(holdTime -> (long) holdTime * (time - holdTime) > distance)
+        .count();
   }
 
-  public record SingleRace(int time, long distance) {}
+  public record SingleRace(int time, long distance) {
+  }
 
   @Override
   public Object part2() {