need to be merge to the main and add some line for the makefile

Makefile

@@ -16,11 +16,15 @@ clean:
 
 lint:
 	uv run flake8 . --exclude=.venv
-	uv run mypy . --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs
+	uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs src
+	uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs tests
+	uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs a_maze_ing.py
 
 lint-strict:
-	uv run flake8 .
-	uv run mypy . --strict
+	uv run flake8 . --exclude=.venv
+	uv run env PYTHONPATH=src python3 -m mypy --strict src
+	uv run env PYTHONPATH=src python3 -m mypy --strict tests
+	uv run env PYTHONPATH=src python3 -m mypy --strict a_maze_ing.py
 
 run_test_parsing:
 	PYTHONPATH=src uv run pytest tests/test_parsing.py

a_maze_ing.py

@@ -1,9 +1,9 @@
 from typing import Any
+from numpy.typing import NDArray
 from src.AMazeIng import AMazeIng
 from src.parsing import Parsing
-from mlx.mlx import Mlx
-import numpy as np
-import math
+from mlx import Mlx
+import time
 
 
 class MazeMLX:
@@ -11,10 +11,11 @@ class MazeMLX:
         self.mlx = Mlx()
         self.height = height
         self.width = width
+        self.print_path = False
+        self.color = [0x00, 0x00, 0xFF, 0xFF]
         self.mlx_ptr = self.mlx.mlx_init()
-        self.generator = None
         self.win_ptr = self.mlx.mlx_new_window(
-            self.mlx_ptr, width, height, "amazing"
+            self.mlx_ptr, width, height + 200, "A-Maze-Ing"
         )
         self.img_ptr = self.mlx.mlx_new_image(self.mlx_ptr, width, height)
         self.buf, self.bpp, self.size_line, self.format = (
@@ -24,48 +25,121 @@ class MazeMLX:
     def close(self) -> None:
         self.mlx.mlx_destroy_image(self.mlx_ptr, self.img_ptr)
 
-    def put_pixel(self, x, y) -> None:
-        offset = y * self.size_line + x * (self.bpp // 8)
-
-        self.buf[offset + 0] = 0xFF
-        self.buf[offset + 1] = 0xFF
-        self.buf[offset + 2] = 0xFF
-        if self.bpp >= 32:
-            self.buf[offset + 3] = 0xFF
+    def close_loop(self, _: Any) -> None:
+        self.mlx.mlx_loop_exit(self.mlx_ptr)
 
     def clear_image(self) -> None:
         self.buf[:] = b"\x00" * len(self.buf)
-        self.mlx.mlx_clear_window(self.mlx_ptr, self.win_ptr)
 
-    def put_line(self, start: tuple[int, int], end: tuple[int, int]) -> None:
+    def redraw_image(self) -> None:
+        self.mlx.mlx_clear_window(self.mlx_ptr, self.win_ptr)
+        self.mlx.mlx_put_image_to_window(
+            self.mlx_ptr, self.win_ptr, self.img_ptr, 0, 0
+        )
+        self.mlx.mlx_string_put(
+            self.mlx_ptr,
+            self.win_ptr,
+            self.width // 3,
+            self.height + 100,
+            0xFFFFFF,
+            "1: regen; 2: path; 3: color; 4: quit;",
+        )
+
+    def put_pixel(self, x: int, y: int, color: list[Any] | None = None
+                  ) -> None:
+        if x < 0 or y < 0 or x >= self.width or y >= self.height:
+            return
+        offset = y * self.size_line + x * (self.bpp // 8)
+
+        if color:
+            self.buf[offset + 0] = color[0]
+            self.buf[offset + 1] = color[1]
+            self.buf[offset + 2] = color[2]
+            if self.bpp >= 32:
+                self.buf[offset + 3] = color[3]
+        else:
+            self.buf[offset + 0] = self.color[0]
+            self.buf[offset + 1] = self.color[1]
+            self.buf[offset + 2] = self.color[2]
+            if self.bpp >= 32:
+                self.buf[offset + 3] = self.color[3]
+
+    def put_line(
+        self,
+        start: tuple[int, int],
+        end: tuple[int, int],
+        color: list[Any] | None = None,
+    ) -> None:
         sx, sy = start
         ex, ey = end
         if sy == ey:
             for x in range(min(sx, ex), max(sx, ex) + 1):
-                self.put_pixel(x, sy)
+                self.put_pixel(x, sy, color)
         if sx == ex:
             for y in range(min(sy, ey), max(sy, ey) + 1):
-                self.put_pixel(sx, y)
+                self.put_pixel(sx, y, color)
 
-    def update_maze(self, maze: np.ndarray) -> None:
-        self.clear_image()
-        margin = math.trunc(
-            math.sqrt(self.width if self.width > self.height else self.height)
-            // 2
-        )
-        line_len = math.trunc(
-            (
-                (self.height - margin) // len(maze)
-                if self.height > self.width
-                else (self.width - margin) // len(maze[0])
+    def put_block(
+        self,
+        ul: tuple[int, int],
+        dr: tuple[int, int],
+        color: list[Any] | None = None,
+    ) -> None:
+        for y in range(min(ul[1], dr[1]), max(dr[1], ul[1])):
+            self.put_line(
+                (min(ul[0], dr[0]), y), (max(ul[0], dr[0]), y), color
             )
-        )
+
+    @staticmethod
+    def random_color_ft() -> Any:
+        colors = [
+            [0xFF, 0xBF, 0x00, 0xFF],  # blue
+            [0x00, 0xFF, 0x40, 0xFF],  # green
+            [0xFF, 0x00, 0xFF, 0xFF],  # pink
+            [0x00, 0xFF, 0xFF, 0xFF],  # yellow
+        ]
+        while True:
+            for color in colors:
+                yield color
+
+    @staticmethod
+    def random_color() -> Any:
+        colors = [
+            [0xFF, 0x00, 0xFF, 0xFF],  # pink
+            [0x00, 0xFF, 0xFF, 0xFF],  # yellow
+            [0x00, 0xFF, 0x40, 0xFF],  # green
+            [0xFF, 0xBF, 0x00, 0xFF],  # blue
+            [0xFF, 0x00, 0x80, 0xFF],  # purple
+            [0x00, 0x00, 0xFF, 0xFF],  # red
+        ]
+        while True:
+            for color in colors:
+                yield color
+
+    def get_margin_line_len(self, maze: NDArray[Any]) -> tuple[int, int, int]:
+        rows = len(maze)
+        cols = len(maze[0])
+
+        line_len = min(self.width // cols, self.height // rows) - 1
+
+        maze_width = cols * line_len
+        maze_height = rows * line_len
+
+        margin_x = ((self.width - maze_width) // 2) + 1
+        margin_y = ((self.height - maze_height) // 2) + 1
+
+        return (line_len, margin_x, margin_y)
+
+    def update_maze(self, maze: NDArray[Any]) -> None:
+        self.clear_image()
+
+        line_len, margin_x, margin_y = self.get_margin_line_len(maze)
         for y in range(len(maze)):
             for x in range(len(maze[0])):
-                x0 = x * line_len + margin
-                y0 = y * line_len + margin
-                x1 = x * line_len + line_len + margin
-                y1 = y * line_len + line_len + margin
+                x0 = x * line_len + margin_x
+                y0 = y * line_len + margin_y
+                x1 = x * line_len + line_len + margin_x
+                y1 = y * line_len + line_len + margin_y
 
                 if maze[y][x].get_north():
                     self.put_line((x0, y0), (x1, y0))
@@ -75,28 +149,195 @@ class MazeMLX:
                     self.put_line((x0, y1), (x1, y1))
                 if maze[y][x].get_west():
                     self.put_line((x0, y0), (x0, y1))
-        self.mlx.mlx_put_image_to_window(
-            self.mlx_ptr, self.win_ptr, self.img_ptr, 0, 0)
 
-    def close_loop(self, _: Any):
-        self.mlx.mlx_loop_exit(self.mlx_ptr)
+    def put_path(self, amazing: AMazeIng) -> Any:
+        path = amazing.solve_path()
+        print(path)
+        actual = amazing.entry
+        actual = (actual[0] - 1, actual[1] - 1)
+        maze = amazing.maze.get_maze()
+        if maze is None:
+            return
 
-    def gen_maze(self, amazing: AMazeIng) -> None:
+        line_len, margin_x, margin_y = self.get_margin_line_len(maze)
+
+        for i in range(len(path)):
+            ul = (
+                (actual[0]) * line_len + margin_x + 12,
+                (actual[1]) * line_len + 12 + margin_y,
+            )
+            dr = (
+                (actual[0]) * line_len + line_len + margin_x - 12,
+                (actual[1]) * line_len + line_len - 12 + margin_y,
+            )
+            self.put_block(ul, dr)
+            x0 = actual[0] * line_len + margin_x + 12
+            y0 = actual[1] * line_len + margin_y + 12
+            x1 = actual[0] * line_len + line_len + margin_x - 12
+            y1 = actual[1] * line_len + line_len + margin_y - 12
+            yield
+            match path[i]:
+                case "N":
+                    self.put_block((x0, y0), (x1, y0 - 24))
+                    actual = (actual[0], actual[1] - 1)
+                case "E":
+                    self.put_block((x1, y0), (x1 + 24, y1))
+                    actual = (actual[0] + 1, actual[1])
+                case "S":
+                    self.put_block((x0, y1), (x1, y1 + 24))
+                    actual = (actual[0], actual[1] + 1)
+                case "W":
+                    self.put_block((x0, y0), (x0 - 24, y1))
+                    actual = (actual[0] - 1, actual[1])
+        ul = (
+            (actual[0]) * line_len + margin_x + 12,
+            (actual[1]) * line_len + 12 + margin_y,
+        )
+        dr = (
+            (actual[0]) * line_len + line_len + margin_x - 12,
+            (actual[1]) * line_len + line_len - 12 + margin_y,
+        )
+        self.put_block(ul, dr)
+        return
+
+    def put_start_end(self, amazing: AMazeIng) -> None:
+        entry = amazing.entry
+        exit = amazing.exit
+        maze = amazing.maze.get_maze()
+        if maze is None:
+            return
+
+        line_len, margin_x, margin_y = self.get_margin_line_len(maze)
+
+        ul = (
+            (entry[0] - 1) * line_len + margin_x + 3,
+            (entry[1] - 1) * line_len + 3 + margin_y,
+        )
+        dr = (
+            (entry[0] - 1) * line_len + line_len + margin_x - 3,
+            (entry[1] - 1) * line_len + line_len - 3 + margin_y,
+        )
+        self.put_block(ul, dr, [0xFF, 0xBF, 0x00, 0x9F])
+
+        ul = (
+            (exit[0] - 1) * line_len + margin_x + 3,
+            (exit[1] - 1) * line_len + 3 + margin_y,
+        )
+        dr = (
+            (exit[0] - 1) * line_len + line_len + margin_x - 3,
+            (exit[1] - 1) * line_len + line_len - 3 + margin_y,
+        )
+        self.put_block(ul, dr, [0x00, 0xFF, 0x40, 0x9F])
+
+    def draw_ft(self, maze: NDArray[Any], color: list[Any] | None = None
+                ) -> None:
+        line_len, margin_x, margin_y = self.get_margin_line_len(maze)
+
+        for y in range(len(maze)):
+            for x in range(len(maze[0])):
+                if maze[y][x].value == 15:
+                    x0 = x * line_len + margin_x
+                    y0 = y * line_len + margin_y
+                    x1 = x * line_len + line_len + margin_x
+                    y1 = y * line_len + line_len + margin_y
+                    self.put_block((x0, y0), (x1, y1), color)
+
+    def draw_image(self, amazing: AMazeIng) -> None:
+        maze = amazing.maze.get_maze()
+        if self.render_maze(amazing):
+            if self.print_path:
+                if self.render_path():
+                    color = next(self.color_gen_ft)
+                    if maze is not None:
+                        self.draw_ft(maze, color)
+                    next(self.timer_gen)
+            else:
+                self.time_gen()
+                if maze is not None:
+                    self.update_maze(maze)
+                    self.draw_ft(maze)
+            self.put_start_end(amazing)
+        self.redraw_image()
+
+    def shift_color(self) -> None:
+        self.color_gen = self.random_color()
+
+    def shift_color_ft(self) -> None:
+        self.color_gen_ft = self.random_color_ft()
+
+    def time_gen(self) -> None:
+        self.timer_gen = self.time_generator()
+
+    def restart_maze(self, amazing: AMazeIng) -> None:
         self.generator = amazing.generate()
 
-    def start(self, amazing: AMazeIng) -> None:
-        self.gen_maze(amazing)
-        self.mlx.mlx_loop_hook(self.mlx_ptr, self.render, amazing)
-        self.mlx.mlx_hook(self.win_ptr, 33, 0, self.close_loop, None)
-        self.mlx.mlx_loop(self.mlx_ptr)
+    def time_generator(self) -> Any:
+        yield
+        while True:
+            time.sleep(0.3)
+            yield
 
-    def render(self, amazing: AMazeIng):
+    def restart_path(self, amazing: AMazeIng) -> None:
+        self.path_printer = self.put_path(amazing)
+
+    def render_path(self) -> bool:
         try:
-            next(self.generator)
-            self.update_maze(amazing.maze.get_maze())
-            # time.sleep(0.01)
+            next(self.path_printer)
+            time.sleep(0.03)
+            return False
         except StopIteration:
             pass
+        return True
+
+    def render_maze(self, amazing: AMazeIng) -> bool:
+        try:
+            maze = amazing.maze.get_maze()
+            next(self.generator)
+            if maze is not None:
+                self.update_maze(maze)
+            return False
+        except StopIteration:
+            pass
+        return True
+
+    def handle_key_press(self, keycode: int, amazing: AMazeIng) -> None:
+        if keycode == 49:
+            self.restart_maze(amazing)
+            self.print_path = False
+        if keycode == 50:
+            self.restart_path(amazing)
+            self.print_path = True if self.print_path is False else False
+        if keycode == 51:
+            self.print_path = False
+            self.color = next(self.color_gen)
+        if keycode == 52:
+            self.close_loop(None)
+
+    def handle_key_press_mteriier(self, keycode: int,
+                                  amazing: AMazeIng) -> None:
+        if keycode == 38:
+            self.restart_maze(amazing)
+            self.print_path = False
+        if keycode == 233:
+            self.restart_path(amazing)
+            self.print_path = True if self.print_path is False else False
+        if keycode == 34:
+            self.print_path = False
+            self.color = next(self.color_gen)
+        if keycode == 39:
+            self.close_loop(None)
+
+    def start(self, amazing: AMazeIng) -> None:
+        self.restart_maze(amazing)
+        self.shift_color()
+        self.shift_color_ft()
+        self.time_gen()
+        self.mlx.mlx_loop_hook(self.mlx_ptr, self.draw_image, amazing)
+        self.mlx.mlx_hook(self.win_ptr, 33, 0, self.close_loop, None)
+        self.mlx.mlx_hook(
+            self.win_ptr, 2, 1 << 0, self.handle_key_press, amazing
+        )
+        self.mlx.mlx_loop(self.mlx_ptr)
 
 
 def main() -> None:

config.txt

@@ -1,8 +1,8 @@
-WIDTH=20
-HEIGHT=20
+WIDTH=10
+HEIGHT=10
 ENTRY=1,1
-EXIT=2,2
+EXIT=5,5
 OUTPUT_FILE=maze.txt
 PERFECT=False
 GENERATOR=DFS
-SOLVER=AStar
+SOLVER=DFS

output_validator.py

@@ -1,25 +0,0 @@
-# This script does not check for errors or malformed files.
-# It only validates that neighbooring cells sharing a wall have
-#  both the correct encoding.
-# Usage: python3 output_validator.py output_maze.txt
-
-import sys
-
-if len(sys.argv) != 2:
-    print(f"Usage: python3 {sys.argv[0]} <output_file>")
-    sys.exit(1)
-
-g = []
-for line in open(sys.argv[1]):
-    if line.strip() == '':
-        break
-    g.append([int(c, 16) for c in line.strip(' \t\n\r')])
-
-for r in range(len(g)):
-    for c in range(len(g[0])):
-        v = g[r][c]
-        if not all([(r < 1 or v & 1 == (g[r-1][c] >> 2) & 1),
-                    (c >= len(g[0])-1 or (v >> 1) & 1 == (g[r][c+1] >> 3) & 1),
-                    (r >= len(g)-1 or (v >> 2) & 1 == g[r+1][c] & 1),
-                    (c < 1 or (v >> 3) & 1 == (g[r][c-1] >> 1) & 1)]):
-            print(f'Wrong encoding for ({c},{r})')

pyproject.toml

@@ -20,6 +20,7 @@ dev = [
 
 [tool.mypy]
 python_version = "3.10"
+explicit_package_bases = true
 
 [tool.pytest.ini_options]
 pythonpath = ["src"]

src/AMazeIng.py

@@ -2,7 +2,7 @@ from typing import Generator
 from typing_extensions import Self
 from pydantic import BaseModel, Field, model_validator, ConfigDict
 
-from src.amaz_lib import Maze, MazeGenerator, MazeSolver
+from .amaz_lib import Maze, MazeGenerator, MazeSolver
 
 
 class AMazeIng(BaseModel):
@@ -20,9 +20,9 @@ class AMazeIng(BaseModel):
 
     @model_validator(mode="after")
     def check_entry_exit(self) -> Self:
-        if self.entry[0] >= self.width or self.entry[1] >= self.height:
+        if self.entry[0] > self.width or self.entry[1] > self.height:
             raise ValueError("Entry coordinates exceed the maze size")
-        if self.exit[0] >= self.width or self.exit[1] >= self.height:
+        if self.exit[0] > self.width or self.exit[1] > self.height:
             raise ValueError("Exit coordinates exceed the maze size")
         return self
 
@@ -33,7 +33,7 @@ class AMazeIng(BaseModel):
         return
 
     def solve_path(self) -> str:
-        return self.solver.solve(self.maze)
+        return self.solver.solve(self.maze, self.height, self.width)
 
     def __str__(self) -> str:
         res = self.maze.__str__()

src/amaz_lib/Maze.py

@@ -1,16 +1,16 @@
 from dataclasses import dataclass
-
-import numpy
+from numpy.typing import NDArray
+from typing import Optional, Any
 
 
 @dataclass
 class Maze:
-    maze: numpy.ndarray
+    maze: Optional[NDArray[Any]] = None
 
-    def get_maze(self) -> numpy.ndarray | None:
+    def get_maze(self) -> Optional[NDArray[Any]]:
         return self.maze
 
-    def set_maze(self, new_maze: numpy.ndarray) -> None:
+    def set_maze(self, new_maze: NDArray[Any]) -> None:
         self.maze = new_maze
 
     def __str__(self) -> str:
@@ -24,6 +24,9 @@ class Maze:
         return res
 
     def ascii_print(self) -> None:
+        if self.maze is None:
+            print("None")
+            return
         for cell in self.maze[0]:
             print("_", end="")
             if cell.get_north():

src/amaz_lib/MazeGenerator.py

@@ -1,12 +1,15 @@
 from abc import ABC, abstractmethod
-from typing import Generator, Set
+from typing import Generator, Any
 import numpy as np
+from numpy.typing import NDArray
 from .Cell import Cell
 import math
+import random
 
 
 class MazeGenerator(ABC):
-    def __init__(self, start: tuple, end: tuple, perfect: bool) -> None:
+    def __init__(self, start: tuple[int, int], end: tuple[int, int],
+                 perfect: bool) -> None:
         self.start = (start[0] - 1, start[1] - 1)
         self.end = (end[0] - 1, end[1] - 1)
         self.perfect = perfect
@@ -14,10 +17,10 @@ class MazeGenerator(ABC):
     @abstractmethod
     def generator(
         self, height: int, width: int, seed: int | None = None
-    ) -> Generator[np.ndarray, None, np.ndarray]: ...
+    ) -> Generator[NDArray[Any], None, NDArray[Any]]: ...
 
     @staticmethod
-    def get_cell_ft(width: int, height: int) -> set:
+    def get_cell_ft(width: int, height: int) -> set[tuple[int, int]]:
         forty_two = set()
         y, x = (int(height / 2), int(width / 2))
         forty_two.add((y, x - 1))
@@ -42,9 +45,10 @@ class MazeGenerator(ABC):
 
     @staticmethod
     def unperfect_maze(width: int, height: int,
-                       maze: np.ndarray, forty_two: set | None,
+                       maze: NDArray[Any],
+                       forty_two: set[tuple[int, int]] | None,
                        prob: float = 0.1
-                       ) -> Generator[np.ndarray, None, np.ndarray]:
+                       ) -> Generator[NDArray[Any], None, NDArray[Any]]:
         directions = {
             "N": (0, -1),
             "S": (0, 1),
@@ -94,19 +98,19 @@ class MazeGenerator(ABC):
 
 class Kruskal(MazeGenerator):
 
-    class Set:
+    class KruskalSet:
         def __init__(self, cells: list[int]) -> None:
             self.cells: list[int] = cells
 
     class Sets:
-        def __init__(self, sets: list[Set]) -> None:
+        def __init__(self, sets: list['Kruskal.KruskalSet']) -> None:
             self.sets = sets
 
     @staticmethod
     def walls_to_maze(
-        walls: np.ndarray, height: int, width: int
-    ) -> np.ndarray:
-        maze: np.ndarray = np.array(
+        walls: list[tuple[int, int]], height: int, width: int
+    ) -> NDArray[Any]:
+        maze: NDArray[Any] = np.array(
             [[Cell(value=0) for _ in range(width)] for _ in range(height)]
         )
         for wall in walls:
@@ -171,7 +175,7 @@ class Kruskal(MazeGenerator):
 
     def generator(
         self, height: int, width: int, seed: int | None = None
-    ) -> Generator[np.ndarray, None, np.ndarray]:
+    ) -> Generator[NDArray[Any], None, NDArray[Any]]:
         cells_ft = None
         if height > 10 and width > 10:
             cells_ft = self.get_cell_ft(width, height)
@@ -180,7 +184,7 @@ class Kruskal(MazeGenerator):
 
         if seed is not None:
             np.random.seed(seed)
-        sets = self.Sets([self.Set([i]) for i in range(height * width)])
+        sets = self.Sets([self.KruskalSet([i]) for i in range(height * width)])
         walls = []
         for h in range(height):
             for w in range(width - 1):
@@ -217,28 +221,29 @@ class Kruskal(MazeGenerator):
 
 
 class DepthFirstSearch(MazeGenerator):
-    def __init__(self, start: bool, end: bool, perfect: bool) -> None:
+    def __init__(self, start: tuple[int, int], end: tuple[int, int],
+                 perfect: bool) -> None:
         self.start = (start[0] - 1, start[1] - 1)
         self.end = (end[0] - 1, end[1] - 1)
         self.perfect = perfect
-        self.forty_two: set | None = None
+        self.forty_two: set[tuple[int, int]] | None = None
 
     def generator(
-        self, height: int, width: int, seed: int = None
-    ) -> Generator[np.ndarray, None, np.ndarray]:
+        self, height: int, width: int, seed: int | None = None
+    ) -> Generator[NDArray[Any], None, NDArray[Any]]:
         if seed is not None:
             np.random.seed(seed)
         maze = self.init_maze(width, height)
         if width > 9 and height > 9:
             self.forty_two = self.get_cell_ft(width, height)
-        visited = np.zeros((height, width), dtype=bool)
+        visited: NDArray[np.object_] = np.zeros((height, width), dtype=bool)
         if (
             self.forty_two
             and self.start not in self.forty_two
             and self.end not in self.forty_two
         ):
             visited = self.lock_cell_ft(visited, self.forty_two)
-        path = list()
+        path: list[tuple[int, int]] = list()
         w_h = (width, height)
         coord = (0, 0)
         x, y = coord
@@ -277,20 +282,22 @@ class DepthFirstSearch(MazeGenerator):
         return maze
 
     @staticmethod
-    def init_maze(width: int, height: int) -> np.ndarray:
+    def init_maze(width: int, height: int) -> NDArray[Any]:
         maze = np.array(
             [[Cell(value=15) for _ in range(width)] for _ in range(height)]
         )
         return maze
 
     @staticmethod
-    def add_cell_visited(coord: tuple, path: set) -> list:
+    def add_cell_visited(coord: tuple[int, int], path: list[tuple[int, int]]
+                         ) -> list[tuple[int, int]]:
         path.append(coord)
         return path
 
     @staticmethod
-    def random_cells(visited: np.array, coord: tuple, w_h: tuple) -> list:
-        rand_cell = []
+    def random_cells(visited: NDArray[Any], coord: tuple[int, int],
+                     w_h: tuple[int, int]) -> list[str]:
+        rand_cell: list[str] = []
         x, y = coord
         width, height = w_h
 
@@ -308,8 +315,8 @@ class DepthFirstSearch(MazeGenerator):
         return rand_cell
 
     @staticmethod
-    def next_step(rand_cell: list) -> str:
-        return np.random.choice(rand_cell)
+    def next_step(rand_cell: list[str]) -> str:
+        return random.choice(rand_cell)
 
     @staticmethod
     def broken_wall(cell: Cell, wall: str) -> Cell:
@@ -324,7 +331,7 @@ class DepthFirstSearch(MazeGenerator):
         return cell
 
     @staticmethod
-    def next_cell(x: int, y: int, next: str) -> tuple:
+    def next_cell(x: int, y: int, next: str) -> tuple[int, int]:
         next_step = {"N": (0, -1), "S": (0, 1), "W": (-1, 0), "E": (1, 0)}
         add_x, add_y = next_step[next]
         return (x + add_x, y + add_y)
@@ -334,7 +341,8 @@ class DepthFirstSearch(MazeGenerator):
         return {"N": "S", "S": "N", "W": "E", "E": "W"}[direction]
 
     @staticmethod
-    def back_on_step(path: list, w_h: tuple, visited: np.ndarray) -> list:
+    def back_on_step(path: list[tuple[int, int]], w_h: tuple[int, int],
+                     visited: NDArray[Any]) -> list[tuple[int, int]]:
         while path:
             last = path[-1]
             if DepthFirstSearch.random_cells(visited, last, w_h):
@@ -344,8 +352,8 @@ class DepthFirstSearch(MazeGenerator):
 
     @staticmethod
     def lock_cell_ft(
-        visited: np.ndarray, forty_two: set[tuple[int]]
-    ) -> np.ndarray:
+        visited: NDArray[Any], forty_two: set[tuple[int, int]]
+    ) -> NDArray[Any]:
         tab = [cell for cell in forty_two]
         for cell in tab:
             visited[cell] = True

src/amaz_lib/MazeSolver.py

@@ -1,6 +1,9 @@
 from abc import ABC, abstractmethod
 from .Maze import Maze
+from typing import Any
 import numpy as np
+from numpy.typing import NDArray
+import random
 
 
 class MazeSolver(ABC):
@@ -9,178 +12,187 @@ class MazeSolver(ABC):
         self.end = (end[1] - 1, end[0] - 1)
 
     @abstractmethod
-    def solve(self, maze: Maze, height: int = None,
-              width: int = None) -> str: ...
+    def solve(
+        self, maze: Maze, height: int | None = None, width: int | None = None
+    ) -> str: ...
 
 
 class AStar(MazeSolver):
+    class Node:
+        def __init__(
+            self,
+            coordinate: tuple[int, int],
+            g: int,
+            h: int,
+            f: int,
+            parent: Any,
+        ) -> None:
+            self.coordinate = coordinate
+            self.g = g
+            self.h = h
+            self.f = f
+            self.parent = parent
+
+        def __eq__(self, value: object, /) -> bool:
+            return value == self.coordinate
 
     def __init__(self, start: tuple[int, int], end: tuple[int, int]) -> None:
         super().__init__(start, end)
 
-    def f(self, n):
-        def g(n: tuple[int, int]) -> int:
-            res = 0
-            if n[0] < self.start[0]:
-                res += self.start[0] - n[0]
-            else:
-                res += n[0] - self.start[0]
-            if n[1] < self.start[1]:
-                res += self.start[1] - n[1]
-            else:
-                res += n[1] - self.start[1]
-            return res
-
-        def h(n: tuple[int, int]) -> int:
-            res = 0
-            if n[0] < self.end[0]:
-                res += self.end[0] - n[0]
-            else:
-                res += n[0] - self.end[0]
-            if n[1] < self.end[1]:
-                res += self.end[1] - n[1]
-            else:
-                res += n[1] - self.end[1]
-            return res
-
-        try:
-            return g(n) + h(n)
-        except Exception:
-            return 1000
-
-    def best_path(
-        self,
-        maze: np.ndarray,
-        actual: tuple[int, int],
-        last: str | None,
-    ) -> dict[str, int]:
-        path = {
-            "N": (
-                self.f((actual[0], actual[1] - 1))
-                if not maze[actual[1]][actual[0]].get_north() and actual[1] > 0
-                else None
-            ),
-            "E": (
-                self.f((actual[0] + 1, actual[1]))
-                if not maze[actual[1]][actual[0]].get_est()
-                and actual[0] < len(maze[0]) - 1
-                else None
-            ),
-            "S": (
-                self.f((actual[0], actual[1] + 1))
-                if not maze[actual[1]][actual[0]].get_south()
-                and actual[1] < len(maze) - 1
-                else None
-            ),
-            "W": (
-                self.f((actual[0] - 1, actual[1]))
-                if not maze[actual[1]][actual[0]].get_west() and actual[0] > 0
-                else None
-            ),
-        }
-        return {
-            k: v
-            for k, v in sorted(path.items(), key=lambda item: item[0])
-            if v is not None and k != last
-        }
-
-    def get_opposit(self, dir: str) -> str:
-        match dir:
-            case "N":
-                return "S"
-            case "E":
-                return "W"
-            case "S":
-                return "N"
-            case "W":
-                return "E"
-            case _:
-                return ""
-
-    def get_next_pos(
-        self, dir: str, actual: tuple[int, int]
-    ) -> tuple[int, int]:
-        match dir:
-            case "N":
-                return (actual[0], actual[1] - 1)
-            case "E":
-                return (actual[0] + 1, actual[1])
-            case "S":
-                return (actual[0], actual[1] + 1)
-            case "W":
-                return (actual[0] - 1, actual[1])
-            case _:
-                return actual
-
-    def get_path(self, maze: np.ndarray) -> str | None:
-        path = [(self.start, self.best_path(maze, self.start, None))]
-        visited = [self.start]
-        while len(path) > 0 and path[-1][0] != self.end:
-            if len(path[-1][1]) == 0:
-                path.pop(-1)
-                if len(path) == 0:
-                    break
-                k = next(iter(path[-1][1]))
-                path[-1][1].pop(k)
-                continue
-
-            while len(path[-1][1]) > 0:
-                next_pos = self.get_next_pos(
-                    list(path[-1][1].keys())[0], path[-1][0]
-                )
-                if next_pos in visited:
-                    k = next(iter(path[-1][1]))
-                    path[-1][1].pop(k)
-                else:
-                    break
-            if len(path[-1][1]) == 0:
-                path.pop(-1)
-                continue
-
-            pre = self.get_opposit(list(path[-1][1].keys())[0])
-            path.append(
-                (
-                    next_pos,
-                    self.best_path(maze, next_pos, pre),
-                )
-            )
-            visited += [next_pos]
-        if len(path) == 0:
-            return None
-        path[-1] = (self.end, {})
-        return "".join(
-            str(list(c[1].keys())[0]) for c in path if len(c[1]) > 0
+    def h(self, n: tuple[int, int]) -> int:
+        return (
+            max(n[0], self.end[0])
+            - min(n[0], self.end[0])
+            + max(n[1], self.end[1])
+            - min(n[1], self.end[1])
         )
 
-    def solve(self, maze: Maze) -> str:
-        res = self.get_path(maze.get_maze())
-        if res is None:
-            raise Exception("Path not found")
+    def get_paths(
+        self,
+        maze: NDArray[Any],
+        actual: tuple[int, int],
+        close: list['Node'],
+    ) -> list[tuple[int, int]]:
+        path = [
+            (
+                (actual[0], actual[1] - 1)
+                if not maze[actual[1]][actual[0]].get_north()
+                and actual[1] > 0
+                and (actual[0], actual[1] - 1)
+                not in [n.coordinate for n in close]
+                else None
+            ),
+            (
+                (actual[0] + 1, actual[1])
+                if not maze[actual[1]][actual[0]].get_est()
+                and actual[0] < len(maze[0]) - 1
+                and (actual[0] + 1, actual[1])
+                not in [n.coordinate for n in close]
+                else None
+            ),
+            (
+                (actual[0], actual[1] + 1)
+                if not maze[actual[1]][actual[0]].get_south()
+                and actual[1] < len(maze) - 1
+                and (actual[0], actual[1] + 1)
+                not in [n.coordinate for n in close]
+                else None
+            ),
+            (
+                (actual[0] - 1, actual[1])
+                if not maze[actual[1]][actual[0]].get_west()
+                and actual[0] > 0
+                and (actual[0] - 1, actual[1])
+                not in [n.coordinate for n in close]
+                else None
+            ),
+        ]
+        return [p for p in path if p is not None]
+
+    def get_path(self, maze: NDArray[Any]) -> list['Node']:
+        open: list[AStar.Node] = []
+        close: list[AStar.Node] = []
+
+        open.append(
+            AStar.Node(
+                self.start,
+                0,
+                self.h(self.start),
+                self.h(self.start),
+                None,
+            )
+        )
+
+        while len(open) > 0:
+            to_check = sorted(open, key=lambda x: x.f)[0]
+            open.remove(to_check)
+            close.append(to_check)
+            if to_check.coordinate == self.end:
+                return close
+            paths = self.get_paths(maze, to_check.coordinate, close)
+            for path in paths:
+                open.append(
+                    self.Node(
+                        path,
+                        to_check.g + 1,
+                        self.h(path),
+                        self.h(path) + to_check.g + 1,
+                        to_check,
+                    )
+                )
+        raise Exception("Path not found")
+
+    def get_rev_dir(self, current: Node) -> str:
+        if current.parent.coordinate == (
+            current.coordinate[0],
+            current.coordinate[1] - 1,
+        ):
+            return "S"
+        elif current.parent.coordinate == (
+            current.coordinate[0] + 1,
+            current.coordinate[1],
+        ):
+            return "W"
+        elif current.parent.coordinate == (
+            current.coordinate[0],
+            current.coordinate[1] + 1,
+        ):
+            return "N"
+        elif current.parent.coordinate == (
+            current.coordinate[0] - 1,
+            current.coordinate[1],
+        ):
+            return "E"
+        else:
+            raise Exception("Translate error: AStar path not found")
+
+    def translate(self, close: list['Node']) -> str:
+        current = close[-1]
+        res = ""
+        while True:
+            res = self.get_rev_dir(current) + res
+            current = current.parent
+            if current.coordinate == self.start:
+                break
         return res
 
+    def solve(
+        self, maze: Maze, height: int | None = None, width: int | None = None
+    ) -> str:
+        maze_arr = maze.get_maze()
+        if maze_arr is None:
+            raise Exception("Maze is not initialized")
+        path: list[AStar.Node] = self.get_path(maze_arr)
+        return self.translate(path)
+
 
 class DepthFirstSearchSolver(MazeSolver):
-    def __init__(self, start, end):
-        self.start = (start[1] - 1, start[0] - 1)
-        self.end = (end[1] - 1, end[0] - 1)
+    def __init__(self, start: tuple[int, int], end: tuple[int, int]):
+        super().__init__(start, end)
 
-    def solve(self, maze: Maze, height: int = None,
-              width: int = None) -> str:
+    def solve(
+        self, maze: Maze, height: int | None = None, width: int | None = None
+    ) -> str:
         path_str = ""
-        visited = np.zeros((height, width), dtype=bool)
-        path = list()
-        move = list()
+        if height is None or width is None:
+            raise Exception("We need Height and Width in the arg")
+        visited: NDArray[Any] = np.zeros((height, width), dtype=bool)
+        path: list[tuple[int, int]] = list()
+        move: list[str] = list()
         maze_s = maze.get_maze()
+        if maze_s is None:
+            raise Exception("Maze is not initializef")
         coord = self.start
-        h_w = (height, width)
+        h_w: tuple[int, int] = (height, width)
         while coord != self.end:
             visited[coord] = True
             path.append(coord)
-            rand_p = self.random_path(visited, coord, maze_s, h_w)
+            rand_p: list[str] = self.random_path(visited, coord, maze_s, h_w)
 
             if not rand_p:
-                path, move = self.back_on_step(path, visited, maze_s, h_w,
-                                               move)
+                path, move = self.back_on_step(
+                    path, visited, maze_s, h_w, move
+                )
                 if not path:
                     break
                 coord = path[-1]
@@ -195,8 +207,9 @@ class DepthFirstSearchSolver(MazeSolver):
         return path_str
 
     @staticmethod
-    def random_path(visited: np.ndarray, coord: tuple,
-                    maze: np.ndarray, h_w: tuple) -> list:
+    def random_path(visited: NDArray[Any], coord: tuple[int, int],
+                    maze: NDArray[Any], h_w: tuple[int, int]
+                    ) -> list[str]:
         random_p = []
         h, w = h_w
         y, x = coord
@@ -215,12 +228,17 @@ class DepthFirstSearchSolver(MazeSolver):
         return random_p
 
     @staticmethod
-    def next_path(rand_path: list) -> str:
-        return np.random.choice(rand_path)
+    def next_path(rand_path: list[str]) -> str:
+        return random.choice(rand_path)
 
     @staticmethod
-    def back_on_step(path: list, visited: np.ndarray,
-                     maze: np.ndarray, h_w: tuple, move: list) -> list:
+    def back_on_step(
+        path: list[tuple[int, int]],
+        visited: NDArray[Any],
+        maze: NDArray[Any],
+        h_w: tuple[int, int],
+        move: list[str],
+    ) -> tuple[list[Any], list[Any]]:
         while path:
             last = path[-1]
             if DepthFirstSearchSolver.random_path(visited, last, maze, h_w):
@@ -230,7 +248,7 @@ class DepthFirstSearchSolver(MazeSolver):
         return path, move
 
     @staticmethod
-    def next_cell(coord: tuple, next: str) -> tuple:
+    def next_cell(coord: tuple[int, int], next: str) -> tuple[int, int]:
         y, x = coord
         next_step = {"N": (-1, 0), "S": (1, 0), "W": (0, -1), "E": (0, 1)}
         add_y, add_x = next_step[next]

src/parsing/Parsing.py

@@ -1,5 +1,6 @@
-from src.amaz_lib.MazeGenerator import DepthFirstSearch, Kruskal
-from src.amaz_lib.MazeSolver import AStar
+from ..amaz_lib import DepthFirstSearch, Kruskal
+from ..amaz_lib import AStar, DepthFirstSearchSolver
+from typing import Any
 
 
 class DataMaze:
@@ -13,14 +14,14 @@ class DataMaze:
         return data
 
     @staticmethod
-    def transform_data(data: str) -> dict:
+    def transform_data(data: str) -> dict[str, str]:
         tmp = data.split("\n")
         tmp2 = [value.split("=", 1) for value in tmp if "=" in value]
         data_t = {value[0]: value[1] for value in tmp2}
         return data_t
 
     @staticmethod
-    def verif_key_data(data: dict) -> None:
+    def verif_key_data(data: dict[str, str]) -> None:
         key_test = {
             "WIDTH",
             "HEIGHT",
@@ -41,11 +42,11 @@ class DataMaze:
             )
 
     @staticmethod
-    def convert_values(data: dict):
+    def convert_values(data: dict[str, str]) -> dict[str, Any]:
         key_int = {"WIDTH", "HEIGHT"}
         key_tuple = {"ENTRY", "EXIT"}
         key_bool = {"PERFECT"}
-        res: dict = {}
+        res: dict[str, Any] = {}
         for key in key_int:
             res.update({key: int(data[key])})
         for key in key_tuple:
@@ -60,14 +61,16 @@ class DataMaze:
         return res
 
     @staticmethod
-    def get_solver_generator(data: dict, entry: tuple, exit: tuple,
-                             perfect: bool) -> dict:
-        available_generator = {
+    def get_solver_generator(data: dict[str, str], entry: tuple[int, int],
+                             exit: tuple[int, int],
+                             perfect: bool) -> dict[str, Any]:
+        available_generator: dict[str, Any] = {
             "Kruskal": Kruskal,
             "DFS": DepthFirstSearch,
         }
-        available_solver = {
+        available_solver: dict[str, Any] = {
             "AStar": AStar,
+            "DFS": DepthFirstSearchSolver
         }
         res = {}
         res["GENERATOR"] = available_generator[data["GENERATOR"]](entry, exit,
@@ -76,7 +79,7 @@ class DataMaze:
         return res
 
     @staticmethod
-    def convert_tuple(data: str) -> tuple:
+    def convert_tuple(data: str) -> tuple[int, int]:
         data_t = data.split(",")
         if len(data_t) != 2:
             raise ValueError(
@@ -95,7 +98,7 @@ class DataMaze:
         return False
 
     @staticmethod
-    def get_data_maze(name_file: str) -> dict:
+    def get_data_maze(name_file: str) -> dict[str, Any]:
         try:
             data_str = DataMaze.get_file_data(name_file)
             data_dict = DataMaze.transform_data(data_str)

test.txt

@@ -1,24 +0,0 @@
-B9153957955513953953
-AEA96A9569792C6BAAD6
-C5443AA9169281102C53
-95556A82816C2AC2A952
-A93916A86A956C3A86D6
-AEC6C542944513806953
-C395553AC393C2AC787A
-BC69512C7AAC56855692
-A952BAAF96AFFFAD53AE
-A810686FC5057FC516C3
-AAC4543FFFAFFFB96952
-AC5553817FAFD52ABC3A
-815552843FEFFF80296A
-AC553A85413D55406C12
-C53BAAC392C3953C13AA
-9386AC386A9683C56AAA
-846903AE96C568517C2A
-AD3A82C385397C3C5546
-C12AA87AA94293AD5513
-D46C6C5446D46C45556E
-
-1,1
-2,2
-SSEEENENWWWS

tests/test_Cell.py

@@ -1,4 +1,3 @@
-import pytest
 from amaz_lib.Cell import Cell
 
 

tests/test_Maze.py

@@ -15,7 +15,9 @@ def test_maze_setter_getter() -> None:
     )
 
     maze.set_maze(test)
-    assert numpy.array_equal(maze.get_maze(), test) is True
+    m = maze.get_maze()
+    assert m is not None
+    assert numpy.array_equal(m, test) is True
 
 
 def test_maze_str() -> None:

tests/test_MazeGenerator.py

@@ -1,5 +1,5 @@
 import numpy
-from amaz_lib.MazeGenerator import DepthFirstSearch, MazeGenerator
+from amaz_lib.MazeGenerator import DepthFirstSearch
 
 
 class TestMazeGenerator:
@@ -12,7 +12,3 @@ class TestMazeGenerator:
             maze = output
 
         assert maze.shape == w_h
-
-    def test_gen_broken(self) -> None:
-        test = MazeGenerator.gen_broken_set(50, 50)
-        assert len(test) > 0

tests/test_MazeSolver.py

@@ -1,6 +1,6 @@
 from amaz_lib.Cell import Cell
 import numpy as np
-from amaz_lib import AStar, Maze, MazeSolver
+from amaz_lib import AStar, Maze
 
 
 def test_solver() -> None:

tests/test_parsing.py

@@ -4,71 +4,71 @@ import pytest
 
 class TestParsing:
 
-    def test_get_data_valid(self):
+    def test_get_data_valid(self) -> None:
         data = DataMaze.get_file_data("tests/test_txt/config_1.txt")
         assert isinstance(data, str) is True
 
-    def test_file_error(self):
+    def test_file_error(self) -> None:
         with pytest.raises(FileNotFoundError):
             DataMaze.get_file_data("tete")
 
-    # def test_permission_error(self):
+    # def test_permission_error(self) -> None:
     #     with pytest.raises(PermissionError):
     #         DataMaze.get_file_data("tests/test_txt/error_1.txt")
 
-    def test_empty_file_error(self):
+    def test_empty_file_error(self) -> None:
         with pytest.raises(ValueError):
             DataMaze.get_file_data("tests/test_txt/error_6.txt")
 
-    def test_transform_data_valid(self):
+    def test_transform_data_valid(self) -> None:
         data = DataMaze.get_file_data("tests/test_txt/config_1.txt")
         data_2 = DataMaze.transform_data(data)
         assert isinstance(data_2, dict)
 
-    def test_transform__index_error(self):
+    def test_transform__index_error(self) -> None:
         with pytest.raises(IndexError):
             DataMaze.transform_data("asdasdasdasdasdasda\nasdasdas=asdasd")
 
-    def test_key_data_error(self):
+    def test_key_data_error(self) -> None:
         with pytest.raises(KeyError):
             data = DataMaze.get_file_data("tests/test_txt/error_8.txt")
             data2 = DataMaze.transform_data(data)
             DataMaze.verif_key_data(data2)
 
-    def test_key_data_error_2(self):
+    def test_key_data_error_2(self) -> None:
         with pytest.raises(KeyError):
             data = DataMaze.get_file_data("tests/test_txt/error_9.txt")
             data2 = DataMaze.transform_data(data)
             DataMaze.verif_key_data(data2)
 
-    def test_convert_int(self):
+    def test_convert_int(self) -> None:
         with pytest.raises(ValueError):
             data = DataMaze.get_file_data("tests/test_txt/error_2.txt")
             data2 = DataMaze.transform_data(data)
             DataMaze.convert_values(data2)
 
-    def test_tuple_error(self):
+    def test_tuple_error(self) -> None:
         with pytest.raises(ValueError):
             DataMaze.convert_tuple("0,3,5,5")
 
-    def test_tuple_error1(self):
+    def test_tuple_error1(self) -> None:
         with pytest.raises(AttributeError):
-            DataMaze.convert_tuple(None)
+            DataMaze.convert_tuple("None")
 
-    def test_bool_error(self):
+    def test_bool_error(self) -> None:
         with pytest.raises(ValueError):
             DataMaze.convert_bool("Trueeee")
 
-    def test_valid_tuple(self):
+    def test_valid_tuple(self) -> None:
         assert DataMaze.convert_tuple("7534564654, 78") == (7534564654, 78)
 
-    def test_valid_bool(self):
+    def test_valid_bool(self) -> None:
         assert DataMaze.convert_bool("False") is False
 
-    def test_valid_bool1(self):
+    def test_valid_bool1(self) -> None:
         assert DataMaze.convert_bool("True") is True
 
-    def test_data_maze(self):
+    def test_data_maze(self) -> None:
         data = DataMaze.get_data_maze("tests/test_txt/config_1.txt")
         assert data["WIDTH"] == 200
         assert data["HEIGHT"] == 100