AoC 2025 Day 1 - refactor

Author: pareronia

src/main/python/AoC2025_01.py

@@ -4,16 +4,14 @@
 #
 
 import sys
+from enum import Enum
+from enum import auto
+from enum import unique
 
 from aoc.common import InputData
 from aoc.common import SolutionBase
 from aoc.common import aoc_samples
 
-Input = list[int]
-Output1 = int
-Output2 = int
-
-
 TEST = """\
 L68
 L30
@@ -31,31 +29,47 @@
 TOTAL = 100
 
 
+@unique
+class Count(Enum):
+ LANDED_ON_ZERO = auto()
+ PASSED_BY_ZERO = auto()
+
+ def count(self, dial: int, rotation: int) -> int:
+ match self:
+ case Count.LANDED_ON_ZERO:
+ return 1 if (dial + rotation) % TOTAL == 0 else 0
+ case Count.PASSED_BY_ZERO:
+ if rotation >= 0:
+ return (dial + rotation) // TOTAL
+ return ((TOTAL - dial) % TOTAL - rotation) // TOTAL
+
+
+Input = list[int]
+Output1 = int
+Output2 = int
+
+
 class Solution(SolutionBase[Input, Output1, Output2]):
  def parse_input(self, input_data: InputData) -> Input:
  return [
  (1 if line[0] == "R" else -1) * int(line[1:])
  for line in input_data
  ]
 
- def part_1(self, rotations: Input) -> Output1:
- dial = START
- pos = (dial := (dial + r) % TOTAL for r in rotations)
- return sum(p == 0 for p in pos)
-
- def part_2(self, rotations: Input) -> Output2:
+ def solve(self, rotations: Input, count: Count) -> int:
  dial = START
  ans = 0
- for r in rotations:
- div, mod = divmod(r, TOTAL if r > 0 else -TOTAL)
- ans += div
- if (r < 0 and dial != 0 and dial + mod <= 0) or (
- r > 0 and dial + mod >= TOTAL
- ):
- ans += 1
- dial = (dial + r) % TOTAL
+ for rotation in rotations:
+ ans += count.count(dial, rotation)
+ dial = (dial + rotation) % TOTAL
  return ans
 
+ def part_1(self, rotations: Input) -> Output1:
+ return self.solve(rotations, Count.LANDED_ON_ZERO)
+
+ def part_2(self, rotations: Input) -> Output2:
+ return self.solve(rotations, Count.PASSED_BY_ZERO)
+
  @aoc_samples(
  (
  ("part_1", TEST, 3),