more cleanup, comments

codeforkjeff · codeforkjeff · commit 820f629c577f · 2025-01-04T11:24:03.000-08:00
diff --git a/src/main/java/com/codefork/aoc2024/day21/Keypad.java b/src/main/java/com/codefork/aoc2024/day21/Keypad.java
@@ -17,7 +17,7 @@ public class Keypad {
             new Button(">", new Position(2, 1))
     );
 
-    // directional keypad: this is used by both navigator
+    // directional keypad: this is used by both navigators
     public static final Keypad dirKeypad = new Keypad(dirKeypadButtons);
 
     private final List<Button> buttons;
@@ -65,7 +65,7 @@ private Map<Move, List<String>> createShortestPaths() {
             var shortestPaths = ShortestPaths.create(buttons, graph, button1);
             var otherButtons = buttons.stream().filter(b -> !b.equals(button1)).toList();
             for (var button2 : otherButtons) {
-                var presses = shortestPaths.getPossiblePressSequences(button2);
+                var presses = shortestPaths.getPathsAsStrings(button2);
                 //System.out.println("move " + button1 + "->" + button2 + " adding presses=" + presses);
                 result.put(new Move(button1, button2), presses);
             }
@@ -79,10 +79,6 @@ private Map<Move, List<String>> createShortestPaths() {
         return result;
     }
 
-    public Map<String, Button> getButtonsMap() {
-        return buttonsMap;
-    }
-
     public Button getButton(String symbol) {
         return buttonsMap.get(symbol);
     }
diff --git a/src/main/java/com/codefork/aoc2024/day21/Part01.java b/src/main/java/com/codefork/aoc2024/day21/Part01.java
@@ -3,13 +3,8 @@
 import com.codefork.aoc2024.Problem;
 import com.codefork.aoc2024.util.Assert;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
 import java.util.stream.Stream;
 
-import static com.codefork.aoc2024.day21.ShipLock.getNumericPortion;
-
 public class Part01 extends Problem {
 
     public String solve(Stream<String> data) {
diff --git a/src/main/java/com/codefork/aoc2024/day21/PressSequence.java b/src/main/java/com/codefork/aoc2024/day21/PressSequence.java
@@ -5,7 +5,8 @@
 
 /**
  * Represents a sequence of button actions to perform.
- * Order doesn't actually matter in a press sequence, only the moves do.
+ * Order doesn't actually matter in a press sequence, only the moves do,
+ * so we use a Map of Moves to their counts
  */
 public record PressSequence(Map<Move, Long> moves) {
 
diff --git a/src/main/java/com/codefork/aoc2024/day21/ShortestPaths.java b/src/main/java/com/codefork/aoc2024/day21/ShortestPaths.java
@@ -89,10 +89,10 @@ public List<List<Button>> getPaths(Button target) {
 
     /**
      * turns a path (list of Buttons from source to target) into a list of the directional
-     * symbol sequences needed to get from source to target. This is probably not be represented
+     * symbol sequences needed to get from source to target. This is probably not best represented
      * as a String, but that's how I implemented it early on and I didn't want to refactor it.
      */
-    public List<String> getPossiblePressSequences(Button target) {
+    public List<String> getPathsAsStrings(Button target) {
         var paths = getPaths(target);
         return paths.stream()
                 .map(path ->
