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/2022/day18.py

@@ -1,50 +1,58 @@
-import sys
+from typing import Any, Iterator
 
 import numpy as np
 
-xyz = np.asarray(
-    [
-        tuple(int(x) for x in row.split(","))  # type: ignore
-        for row in sys.stdin.read().splitlines()
-    ]
-)
+from ..base import BaseSolver
 
-xyz = xyz - xyz.min(axis=0) + 1
 
-cubes = np.zeros(xyz.max(axis=0) + 3, dtype=bool)
-cubes[xyz[:, 0], xyz[:, 1], xyz[:, 2]] = True
+class Solver(BaseSolver):
+    def solve(self, input: str) -> Iterator[Any]:
+        xyz = np.asarray(
+            [
+                tuple(int(x) for x in row.split(","))  # type: ignore
+                for row in input.splitlines()
+            ]
+        )
 
-n_dims = len(cubes.shape)
+        xyz = xyz - xyz.min(axis=0) + 1
 
-faces = [(-1, 0, 0), (1, 0, 0), (0, -1, 0), (0, 1, 0), (0, 0, -1), (0, 0, 1)]
+        cubes = np.zeros(xyz.max(axis=0) + 3, dtype=bool)
+        cubes[xyz[:, 0], xyz[:, 1], xyz[:, 2]] = True
 
-answer_1 = sum(
-    1 for x, y, z in xyz for dx, dy, dz in faces if not cubes[x + dx, y + dy, z + dz]
-)
-print(f"answer 1 is {answer_1}")
+        faces = [(-1, 0, 0), (1, 0, 0), (0, -1, 0), (0, 1, 0), (0, 0, -1), (0, 0, 1)]
 
-visited = np.zeros_like(cubes, dtype=bool)
-queue = [(0, 0, 0)]
+        yield sum(
+            1
+            for x, y, z in xyz
+            for dx, dy, dz in faces
+            if not cubes[x + dx, y + dy, z + dz]
+        )
 
-n_faces = 0
-while queue:
-    x, y, z = queue.pop(0)
+        visited = np.zeros_like(cubes, dtype=bool)
+        queue = [(0, 0, 0)]
 
-    if visited[x, y, z]:
-        continue
+        n_faces = 0
+        while queue:
+            x, y, z = queue.pop(0)
 
-    visited[x, y, z] = True
+            if visited[x, y, z]:
+                continue
 
-    for dx, dy, dz in faces:
-        nx, ny, nz = x + dx, y + dy, z + dz
-        if not all(n >= 0 and n < cubes.shape[i] for i, n in enumerate((nx, ny, nz))):
-            continue
+            visited[x, y, z] = True
 
-        if visited[nx, ny, nz]:
-            continue
+            for dx, dy, dz in faces:
+                nx, ny, nz = x + dx, y + dy, z + dz
+                if not all(
+                    n >= 0 and n < cubes.shape[i] for i, n in enumerate((nx, ny, nz))
+                ):
+                    continue
 
-        if cubes[nx, ny, nz]:
-            n_faces += 1
-        else:
-            queue.append((nx, ny, nz))
-print(f"answer 2 is {n_faces}")
+                if visited[nx, ny, nz]:
+                    continue
+
+                if cubes[nx, ny, nz]:
+                    n_faces += 1
+                else:
+                    queue.append((nx, ny, nz))
+
+        yield n_faces