Refactor code for API (#3)

Co-authored-by: Mikael CAPELLE <mikael.capelle@thalesaleniaspace.com>
Co-authored-by: Mikaël Capelle <capelle.mikael@gmail.com>
Reviewed-on: #3

src/holt59/aoc/2021/day4.py

@@ -1,45 +1,52 @@
-import sys
+from typing import Any, Iterator
 
 import numpy as np
 
-lines = sys.stdin.read().splitlines()
+from ..base import BaseSolver
 
-numbers = [int(c) for c in lines[0].split(",")]
 
-boards = np.asarray(
-    [
-        [[int(c) for c in line.split()] for line in lines[start : start + 5]]
-        for start in range(2, len(lines), 6)
-    ]
-)
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]:
+        lines = input.splitlines()
 
-# (round, score) for each board (-1 when not found)
-winning_rounds: list[tuple[int, int]] = [(-1, -1) for _ in range(len(boards))]
-marked = np.zeros_like(boards, dtype=bool)
+        numbers = [int(c) for c in lines[0].split(",")]
 
-for round, number in enumerate(numbers):
-    # mark boards
-    marked[boards == number] = True
+        boards = np.asarray(
+            [
+                [[int(c) for c in line.split()] for line in lines[start : start + 5]]
+                for start in range(2, len(lines), 6)
+            ]
+        )
 
-    # check each board for winning
-    for index in range(len(boards)):
-        if winning_rounds[index][0] > 0:
-            continue
+        # (round, score) for each board (-1 when not found)
+        winning_rounds: list[tuple[int, int]] = [(-1, -1) for _ in range(len(boards))]
+        marked = np.zeros_like(boards, dtype=bool)
 
-        if np.any(np.all(marked[index], axis=0) | np.all(marked[index], axis=1)):
-            winning_rounds[index] = (
-                round,
-                number * int(np.sum(boards[index][~marked[index]])),
-            )
+        for round, number in enumerate(numbers):
+            # mark boards
+            marked[boards == number] = True
 
-    # all boards are winning - break
-    if np.all(marked.all(axis=1) | marked.all(axis=2)):
-        break
+            # check each board for winning
+            for index in range(len(boards)):
+                if winning_rounds[index][0] > 0:
+                    continue
 
-# part 1
-(_, score) = min(winning_rounds, key=lambda w: w[0])
-print(f"answer 1 is {score}")
+                if np.any(
+                    np.all(marked[index], axis=0) | np.all(marked[index], axis=1)
+                ):
+                    winning_rounds[index] = (
+                        round,
+                        number * int(np.sum(boards[index][~marked[index]])),
+                    )
 
-# part 2
-(_, score) = max(winning_rounds, key=lambda w: w[0])
-print(f"answer 2 is {score}")
+            # all boards are winning - break
+            if np.all(marked.all(axis=1) | marked.all(axis=2)):
+                break
+
+        # part 1
+        (_, score) = min(winning_rounds, key=lambda w: w[0])
+        yield score
+
+        # part 2
+        (_, score) = max(winning_rounds, key=lambda w: w[0])
+        yield score