Start refactoring code better flexibility.

src/holt59/aoc/2024/day1.py

@@ -1,14 +1,17 @@
-import sys
 from collections import Counter
+from typing import Any, Iterator
 
-values = list(map(int, sys.stdin.read().strip().split()))
+from ..base import BaseSolver
 
-column_1 = sorted(values[::2])
-column_2 = sorted(values[1::2])
-counter_2 = Counter(column_2)
 
-answer_1 = sum(abs(v1 - v2) for v1, v2 in zip(column_1, column_2, strict=True))
-answer_2 = sum(value * counter_2.get(value, 0) for value in column_1)
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]:
+        values = list(map(int, input.split()))
 
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+        column_1 = sorted(values[::2])
+        column_2 = sorted(values[1::2])
+
+        yield sum(abs(v1 - v2) for v1, v2 in zip(column_1, column_2, strict=True))
+
+        counter_2 = Counter(column_2)
+        yield sum(value * counter_2.get(value, 0) for value in column_1)

src/holt59/aoc/2024/day10.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day11.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day12.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day13.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day14.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day15.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day16.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day17.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day18.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day19.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day2.py

@@ -1,22 +1,23 @@
-import sys
+from typing import Any, Iterator
+
+from ..base import BaseSolver
 
 
-def is_safe(level: list[int]) -> bool:
-    diff = [a - b for a, b in zip(level[:-1], level[1:], strict=True)]
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]:
+        def is_safe(level: list[int]) -> bool:
+            diff = [a - b for a, b in zip(level[:-1], level[1:], strict=True)]
 
-    return sum(d > 0 for d in diff) in (0, len(diff)) and all(
-        1 <= abs(d) <= 3 for d in diff
-    )
+            return sum(d > 0 for d in diff) in (0, len(diff)) and all(
+                1 <= abs(d) <= 3 for d in diff
+            )
 
+        def is_any_safe(level: list[int]) -> bool:
+            return any(
+                is_safe(level[:i] + level[i + 1 :]) for i in range(0, len(level))
+            )
 
-def is_any_safe(level: list[int]) -> bool:
-    return any(is_safe(level[:i] + level[i + 1 :]) for i in range(0, len(level)))
+        levels = [[int(c) for c in r.split()] for r in input.splitlines()]
 
-
-levels = [[int(c) for c in r.split()] for r in sys.stdin.read().strip().splitlines()]
-
-answer_1 = sum(is_safe(level) for level in levels)
-answer_2 = sum(is_safe(level) or is_any_safe(level) for level in levels)
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+        yield sum(is_safe(level) for level in levels)
+        yield sum(is_safe(level) or is_any_safe(level) for level in levels)

src/holt59/aoc/2024/day20.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day21.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day22.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day23.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day24.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day25.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day3.py

@@ -1,34 +1,30 @@
 import re
-import sys
-from typing import Iterator
+from typing import Any, Iterator
+
+from ..base import BaseSolver
 
 
-def extract_multiply(line: str) -> Iterator[int]:
-    for m in re.finditer(r"mul\(([0-9]{1,3}),\s*([0-9]{1,3})\)", line):
-        yield int(m.group(1)) * int(m.group(2))
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]:
+        def extract_multiply(line: str) -> Iterator[int]:
+            for m in re.finditer(r"mul\(([0-9]{1,3}),\s*([0-9]{1,3})\)", line):
+                yield int(m.group(1)) * int(m.group(2))
 
+        def valid_memory_blocks(line: str) -> Iterator[str]:
+            accumulate = True
+            while line:
+                if accumulate:
+                    if (dont_i := line.find("don't()")) != -1:
+                        yield line[:dont_i]
+                        line, accumulate = line[dont_i:], False
+                    else:
+                        yield line
+                        line = ""
+                else:
+                    if (do_i := line.find("do()")) != -1:
+                        line, accumulate = line[do_i:], True
+                    else:
+                        line = ""
 
-def valid_memory_blocks(line: str) -> Iterator[str]:
-    accumulate = True
-    while line:
-        if accumulate:
-            if (dont_i := line.find("don't()")) != -1:
-                yield line[:dont_i]
-                line, accumulate = line[dont_i:], False
-            else:
-                yield line
-                line = ""
-        else:
-            if (do_i := line.find("do()")) != -1:
-                line, accumulate = line[do_i:], True
-            else:
-                line = ""
-
-
-line = sys.stdin.read().strip()
-
-answer_1 = sum(extract_multiply(line))
-answer_2 = sum(sum(extract_multiply(block)) for block in valid_memory_blocks(line))
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+        yield sum(extract_multiply(input))
+        yield sum(sum(extract_multiply(block)) for block in valid_memory_blocks(input))

src/holt59/aoc/2024/day4.py

@@ -1,31 +1,37 @@
 import itertools as it
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().strip().splitlines()
-n = len(lines)
+from ..base import BaseSolver
 
-answer_1 = sum(
-    line.count("XMAS") + line.count("SAMX")
-    for i in range(n)
-    for ri, rk, ro, ci, ck, cm in (
-        (1, 0, 0, 0, 1, n),
-        (0, 1, 0, 1, 0, n),
-        (0, 1, 0, 1, 1, n - i),
-        (0, -1, -1, 1, 1, n - i),
-        (1, 1, 0, 0, 1, n - i if i != 0 else 0),
-        (-1, -1, -1, 0, 1, n - i if i != 0 else 0),
-    )
-    if (
-        line := "".join(lines[ri * i + rk * k + ro][ci * i + ck * k] for k in range(cm))
-    )
-)
 
-answer_2 = sum(
-    lines[i][j] == "A"
-    and "".join(lines[i + di][j + dj] for di, dj in it.product((-1, 1), (-1, 1)))
-    in {"MSMS", "SSMM", "MMSS", "SMSM"}
-    for i, j in it.product(range(1, n - 1), range(1, n - 1))
-)
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]:
+        lines = input.splitlines()
+        n = len(lines)
 
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+        yield sum(
+            line.count("XMAS") + line.count("SAMX")
+            for i in range(n)
+            for ri, rk, ro, ci, ck, cm in (
+                (1, 0, 0, 0, 1, n),
+                (0, 1, 0, 1, 0, n),
+                (0, 1, 0, 1, 1, n - i),
+                (0, -1, -1, 1, 1, n - i),
+                (1, 1, 0, 0, 1, n - i if i != 0 else 0),
+                (-1, -1, -1, 0, 1, n - i if i != 0 else 0),
+            )
+            if (
+                line := "".join(
+                    lines[ri * i + rk * k + ro][ci * i + ck * k] for k in range(cm)
+                )
+            )
+        )
+
+        yield sum(
+            lines[i][j] == "A"
+            and "".join(
+                lines[i + di][j + dj] for di, dj in it.product((-1, 1), (-1, 1))
+            )
+            in {"MSMS", "SSMM", "MMSS", "SMSM"}
+            for i, j in it.product(range(1, n - 1), range(1, n - 1))
+        )

src/holt59/aoc/2024/day7.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day8.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...

src/holt59/aoc/2024/day9.py

@@ -1,10 +1,7 @@
-import sys
+from typing import Any, Iterator
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-answer_1 = ...
 
-answer_2 = ...
-
-print(f"answer 1 is {answer_1}")
-print(f"answer 2 is {answer_2}")
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]: ...