more refactoring

SimonBaars · SimonBaars · commit 173fe4622838 · 2024-12-06T18:37:34.000+01:00
diff --git a/src/main/java/com/sbaars/adventofcode/common/Pair.java b/src/main/java/com/sbaars/adventofcode/common/Pair.java
@@ -8,6 +8,10 @@ public static <A, B> Pair<A, B> pair(A a, B b) {
     return new Pair<>(a, b);
   }
 
+  public static <A, B> Pair<A, B> of(A a, B b) {
+    return pair(a, b);
+  }
+
   public A getLeft() {
     return a;
   }
diff --git a/src/main/java/com/sbaars/adventofcode/network/FetchInput.java b/src/main/java/com/sbaars/adventofcode/network/FetchInput.java
@@ -29,7 +29,7 @@ public FetchInput() {
   }
 
   public static void main(String[] args) {
-    new FetchInput().retrieveDay("5", "2024");
+    new FetchInput().retrieveDay("7", "2024");
   }
 
   private void retrieveDay(String day, String year) {
diff --git a/src/main/java/com/sbaars/adventofcode/year24/days/Day6.java b/src/main/java/com/sbaars/adventofcode/year24/days/Day6.java
@@ -92,9 +92,9 @@ private Triple<Integer, Set<Loc>, Boolean> simulate(InfiniteGrid grid, Obstructi
     Direction facing = guardStart.b();
     long x = pos.x, y = pos.y;
     Set<Loc> visitedPositions = new HashSet<>();
-    Set<Triple<Long, Long, Direction>> visitedStates = new HashSet<>();
+    Set<Pair<Loc, Direction>> visitedStates = new HashSet<>();
     visitedPositions.add(new Loc(x, y));
-    visitedStates.add(Triple.of(x, y, facing));
+    visitedStates.add(Pair.of(pos, facing));
     boolean looped = false;
 
     while (true) {
@@ -106,7 +106,7 @@ private Triple<Integer, Set<Loc>, Boolean> simulate(InfiniteGrid grid, Obstructi
       long nSteps = Math.min(stepsToObst, stepsToEdge);
       if (nSteps <= 0) {
         facing = facing.turn(true);
-        Triple<Long, Long, Direction> state = Triple.of(x, y, facing);
+        Pair<Loc, Direction> state = Pair.of(pos, facing);
         if (visitedStates.contains(state)) {
           looped = true;
           break;
@@ -117,12 +117,11 @@ private Triple<Integer, Set<Loc>, Boolean> simulate(InfiniteGrid grid, Obstructi
         continue;
       } else {
         for (long i = 0; i < nSteps; i++) {
-          Loc l = new Loc(x, y).move(facing);
-          pos = l;
-          x = l.x;
-          y = l.y;
+          pos = pos.move(facing);
+          x = pos.x;
+          y = pos.y;
           Loc newPos = new Loc(x, y);
-          Triple<Long, Long, Direction> state = Triple.of(x, y, facing);
+          Pair<Loc, Direction> state = Pair.of(pos, facing);
           if (visitedStates.contains(state)) {
             looped = true;
             break;
@@ -138,7 +137,7 @@ private Triple<Integer, Set<Loc>, Boolean> simulate(InfiniteGrid grid, Obstructi
         Loc nextPos = new Loc(nx, ny);
         if (obstructionData.obstruction().contains(nextPos)) {
           facing = facing.turn(true);
-          Triple<Long, Long, Direction> state = Triple.of(x, y, facing);
+          Pair<Loc, Direction> state = Pair.of(pos, facing);
           if (visitedStates.contains(state)) {
             looped = true;
             break;

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,10 @@ public static <A, B> Pair<A, B> pair(A a, B b) {`
`8`	`8`	`return new Pair<>(a, b);`
`9`	`9`	`}`
`10`	`10`
	`11`	`+ public static <A, B> Pair<A, B> of(A a, B b) {`
	`12`	`+ return pair(a, b);`
	`13`	`+ }`
	`14`	`+`
`11`	`15`	`public A getLeft() {`
`12`	`16`	`return a;`
`13`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public FetchInput() {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public static void main(String[] args) {`
`32`		`- new FetchInput().retrieveDay("5", "2024");`
	`32`	`+ new FetchInput().retrieveDay("7", "2024");`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`private void retrieveDay(String day, String year) {`