refactoring

SimonBaars · SimonBaars · commit d06f61569f72 · 2025-01-31T00:59:06.000+01:00
diff --git a/src/main/java/com/sbaars/adventofcode/year15/days/Day1.java b/src/main/java/com/sbaars/adventofcode/year15/days/Day1.java
@@ -16,15 +16,16 @@ public static void main(String[] args) {
 
   @Override
   public Object part1() {
-    String in = day().trim();
-    return in.replace(")", "").length() - in.replace("(", "").length();
+    return dayStream()
+        .flatMapToInt(String::chars)
+        .map(c -> c == '(' ? 1 : -1)
+        .sum();
   }
 
   @Override
   public Object part2() {
-    String in = day().trim();
     return findReduce(
-        zipWithIndex(in.chars().boxed()),
+        zipWithIndex(dayStream().flatMapToInt(String::chars).boxed()),
         0,
         (c, acc) -> acc + (c.e() == '(' ? 1 : -1),
         acc -> acc < 0
diff --git a/src/main/java/com/sbaars/adventofcode/year15/days/Day2.java b/src/main/java/com/sbaars/adventofcode/year15/days/Day2.java
@@ -20,21 +20,21 @@ private long[] smallestSides() {
     }
 
     private long smallestArea() {
-      long[] s = smallestSides();
+      var s = smallestSides();
       return s[0] * s[1];
     }
 
     private long area() {
-      return 2 * l * w + 2 * w * h + 2 * h * l;
+      return 2 * (l * w + w * h + h * l);
     }
 
     private long wrappingPaper() {
       return smallestArea() + area();
     }
 
     private long sideDistance() {
-      long[] s = smallestSides();
-      return s[0] * 2 + s[1] * 2;
+      var s = smallestSides();
+      return 2 * (s[0] + s[1]);
     }
 
     private long volume() {
@@ -64,7 +64,6 @@ public Object part2() {
 
   private long getResult(ToLongFunction<Dimension> func) {
     return dayStream()
-        .map(String::trim)
         .map(s -> readString(s, "%nx%nx%n", Dimension.class))
         .mapToLong(func)
         .sum();
diff --git a/src/main/java/com/sbaars/adventofcode/year15/days/Day3.java b/src/main/java/com/sbaars/adventofcode/year15/days/Day3.java
@@ -1,9 +1,14 @@
 package com.sbaars.adventofcode.year15.days;
 
 import com.sbaars.adventofcode.common.Direction;
+import com.sbaars.adventofcode.common.location.Loc;
 import com.sbaars.adventofcode.common.location.MutableLoc;
 import com.sbaars.adventofcode.year15.Day2015;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Stream;
+
 import static com.sbaars.adventofcode.common.Direction.*;
 import static com.sbaars.adventofcode.util.AoCUtils.zipWithIndex;
 
@@ -18,26 +23,41 @@ public static void main(String[] args) {
 
   @Override
   public Object part1() {
-    MutableLoc loc = new MutableLoc();
-    return day()
-        .chars()
-        .mapToObj(c -> charToDir((char) c))
-        .map(d -> loc.set(d.move(loc.get())))
-        .distinct()
-        .count();
+    return countVisitedHouses(dayStream()
+        .flatMapToInt(String::chars)
+        .mapToObj(c -> charToDir((char) c)));
   }
 
   @Override
   public Object part2() {
+    return countVisitedHousesWithRobo(dayStream()
+        .flatMapToInt(String::chars)
+        .mapToObj(c -> charToDir((char) c)));
+  }
+
+  private long countVisitedHouses(Stream<Direction> directions) {
+    MutableLoc loc = new MutableLoc();
+    Set<Loc> visited = new HashSet<>();
+    visited.add(loc.get());
+    directions.forEach(d -> visited.add(loc.set(d.move(loc.get()))));
+    return visited.size();
+  }
+
+  private long countVisitedHousesWithRobo(Stream<Direction> directions) {
     MutableLoc santa = new MutableLoc();
     MutableLoc robo = new MutableLoc();
-    return zipWithIndex(day().chars().mapToObj(c -> charToDir((char) c)))
-        .map(d -> d.i() % 2 == 0 ? santa.set(d.e().move(santa.get())) : robo.set(d.e().move(robo.get())))
-        .distinct()
-        .count();
+    Set<Loc> visited = new HashSet<>();
+    visited.add(santa.get());
+    
+    zipWithIndex(directions)
+        .forEach(d -> {
+            var current = d.i() % 2 == 0 ? santa : robo;
+            visited.add(current.set(d.e().move(current.get())));
+        });
+    return visited.size();
   }
 
-  public Direction charToDir(char c) {
+  private static Direction charToDir(char c) {
     return switch (c) {
       case '^' -> NORTH;
       case '>' -> EAST;

Original file line number	Diff line number	Diff line change
`@@ -20,21 +20,21 @@ private long[] smallestSides() {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`private long smallestArea() {`
`23`		`- long[] s = smallestSides();`
	`23`	`+ var s = smallestSides();`
`24`	`24`	`return s[0] * s[1];`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`private long area() {`
`28`		`- return 2 * l * w + 2 * w * h + 2 * h * l;`
	`28`	`+ return 2 * (l * w + w * h + h * l);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`private long wrappingPaper() {`
`32`	`32`	`return smallestArea() + area();`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`private long sideDistance() {`
`36`		`- long[] s = smallestSides();`
`37`		`- return s[0] * 2 + s[1] * 2;`
	`36`	`+ var s = smallestSides();`
	`37`	`+ return 2 * (s[0] + s[1]);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`private long volume() {`
`@@ -64,7 +64,6 @@ public Object part2() {`
`64`	`64`
`65`	`65`	`private long getResult(ToLongFunction<Dimension> func) {`
`66`	`66`	`return dayStream()`
`67`		`- .map(String::trim)`
`68`	`67`	`.map(s -> readString(s, "%nx%nx%n", Dimension.class))`
`69`	`68`	`.mapToLong(func)`
`70`	`69`	`.sum();`