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

Basic main to display ascii print

.gitignore

@@ -98,7 +98,7 @@ ipython_config.py
 #   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
 #   This is especially recommended for binary packages to ensure reproducibility, and is more
 #   commonly ignored for libraries.
-# uv.lock
+uv.lock
 
 # poetry
 #   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
@@ -214,4 +214,5 @@ __marimo__/
 
 # Streamlit
 .streamlit/secrets.toml
+test.txt
 

Makefile

@@ -1,19 +1,40 @@
 install:
 	uv sync
+	uv pip install mlx-2.2-py3-none-any.whl
 
 run: install
 	uv run python3 a_maze_ing.py config.txt
 
+run_windows:
+	.venv\Scripts\python -m a_maze_ing config.txt
+
 debug:
 	uv pdb python3 a_maze_ing.py config.txt
 
 clean:
-	rm -rf __pycache__ .mypy_cache
+	rm -rf __pycache__ .mypy_cache .venv
 
 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
+
+run_test_dfs:
+	PYTHONPATH=src uv run pytest tests/test_Depth.py
+
+run_test_maze_gen:
+	PYTHONPATH=src uv run pytest tests/test_MazeGenerator.py
+run_test:
+	uv run pytest
+mlx:
+	uv run python3 test.py

a_maze_ing.py

@@ -1,21 +1,359 @@
-import os
-from numpy import ma
-from src.amaz_lib import MazeGenerator
-from src.amaz_lib import Maze
+from typing import Any
+from numpy.typing import NDArray
+from src.AMazeIng import AMazeIng
+from src.parsing import Parsing
+from mlx import Mlx
+import time
+
+
+class MazeMLX:
+    def __init__(self, height: int, width: int) -> None:
+        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.win_ptr = self.mlx.mlx_new_window(
+            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 = (
+            self.mlx.mlx_get_data_addr(self.img_ptr)
+        )
+
+    def close(self) -> None:
+        self.mlx.mlx_destroy_image(self.mlx_ptr, self.img_ptr)
+
+    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)
+
+    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, color)
+        if sx == ex:
+            for y in range(min(sy, ey), max(sy, ey) + 1):
+                self.put_pixel(sx, y, color)
+
+    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_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))
+                if maze[y][x].get_est():
+                    self.put_line((x1, y0), (x1, y1))
+                if maze[y][x].get_south():
+                    self.put_line((x0, y1), (x1, y1))
+                if maze[y][x].get_west():
+                    self.put_line((x0, y0), (x0, y1))
+
+    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
+
+        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 time_generator(self) -> Any:
+        yield
+        while True:
+            time.sleep(0.3)
+            yield
+
+    def restart_path(self, amazing: AMazeIng) -> None:
+        self.path_printer = self.put_path(amazing)
+
+    def render_path(self) -> bool:
+        try:
+            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:
-    # try:
-    maze = Maze(maze=None, start=(1, 1), end=(16, 15))
-    for alg in MazeGenerator.Kruskal.kruskal(20, 20):
-        maze.set_maze(alg)
-        os.system("clear")
-        maze.ascii_print()
-    maze.export_maze("test.txt")
-
-
-# except Exception as err:
-# print(err)
+    mlx = None
+    try:
+        mlx = MazeMLX(1000, 1000)
+        config = Parsing.DataMaze.get_data_maze("config.txt")
+        amazing = AMazeIng(**config)
+        mlx.start(amazing)
+        with open("test.txt", "w") as output:
+            output.write(amazing.__str__())
+    except Exception as err:
+        print(err)
+    finally:
+        if mlx is not None:
+            mlx.close()
 
 
 if __name__ == "__main__":

config.txt

@@ -0,0 +1,8 @@
+WIDTH=10
+HEIGHT=10
+ENTRY=1,1
+EXIT=5,5
+OUTPUT_FILE=maze.txt
+PERFECT=False
+GENERATOR=DFS
+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

@@ -14,8 +14,13 @@ dependencies = [
 dev = [
     "mypy>=1.19.1",
     "flake8>=7.3.0",
+    "pytest>=9.0.2",
 ]
 
 
 [tool.mypy]
 python_version = "3.10"
+explicit_package_bases = true
+
+[tool.pytest.ini_options]
+pythonpath = ["src"]

src/AMazeIng.py

@@ -1,30 +1,28 @@
-from dataclasses import field
-from os import eventfd_read
 from typing import Generator
-import numpy
 from typing_extensions import Self
-from pydantic import AfterValidator, BaseModel, Field, model_validator
+from pydantic import BaseModel, Field, model_validator, ConfigDict
 
-from amaz_lib import Maze, MazeGenerator, MazeSolver
-from amaz_lib.Cell import Cell
+from .amaz_lib import Maze, MazeGenerator, MazeSolver
 
 
 class AMazeIng(BaseModel):
-    width: int = Field(ge=3)
-    height: int = Field(ge=3)
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    width: int = Field(ge=4)
+    height: int = Field(ge=4)
     entry: tuple[int, int]
     exit: tuple[int, int]
     output_file: str = Field(min_length=3)
     perfect: bool = Field(default=True)
-    maze: Maze = Field(default=Maze(maze=numpy.array([])))
+    maze: Maze = Field(default=Maze(None))
     generator: MazeGenerator
     solver: MazeSolver
 
     @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
 
@@ -32,9 +30,10 @@ class AMazeIng(BaseModel):
         for array in self.generator.generator(self.height, self.width):
             self.maze.set_maze(array)
             yield self.maze
+        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/Cell.py

@@ -1,8 +1,10 @@
-from pydantic import BaseModel, Field
+from dataclasses import dataclass
 
 
-class Cell(BaseModel):
-    value: int = Field(ge=0, le=15)
+@dataclass
+class Cell:
+    def __init__(self, value: int) -> None:
+        self.value = value
 
     def __str__(self) -> str:
         return hex(self.value).removeprefix("0x").upper()
@@ -41,25 +43,10 @@ class Cell(BaseModel):
         return self.value & 4 == 4
 
     def set_west(self, is_wall: bool) -> None:
-        if (not is_wall and self.value | 8 == 15) or (
-            is_wall and self.value | 8 != 15
+        if (not is_wall and self.value | 7 == 15) or (
+            is_wall and self.value | 7 != 15
         ):
             self.value = self.value ^ (8)
 
     def get_west(self) -> bool:
         return self.value & 8 == 8
-
-
-def main() -> None:
-    c = Cell(value=1)
-    print(c.get_north())
-    c.set_north(True)
-    print(c.get_north())
-    c.set_north(True)
-    print(c.get_north())
-    c.set_north(False)
-    print(c.get_north())
-
-
-if __name__ == "__main__":
-    main()

src/amaz_lib/Maze.py

@@ -1,18 +1,16 @@
 from dataclasses import dataclass
-
-import numpy
-from .Cell import Cell
-from .MazeGenerator import MazeGenerator
+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:
@@ -25,20 +23,18 @@ class Maze:
             res += "\n"
         return res
 
-    def export_maze(self, file_name: str) -> None:
-        with open(file_name, "w") as file:
-            file.write(self.__str__())
-
     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():
+                print("__", end="")
+            else:
+                print("  ", end="")
+        print("_")
         for line in self.maze:
-            if line is self.maze[0]:
-                for cell in line:
-                    print("_", end="")
-                    if cell.get_north():
-                        print("__", end="")
-                    else:
-                        print("  ", end="")
-                print()
             for cell in line:
                 if cell is line[0] and cell.get_west():
                     print("|", end="")

src/amaz_lib/MazeGenerator.py

@@ -1,24 +1,116 @@
 from abc import ABC, abstractmethod
-from typing import Generator
+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[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
+
     @abstractmethod
-    @classmethod
     def generator(
-        cls, height: int, width: int
-    ) -> Generator[np.ndarray, None, np.ndarray]: ...
+        self, height: int, width: int, seed: int | None = None
+    ) -> Generator[NDArray[Any], None, NDArray[Any]]: ...
+
+    @staticmethod
+    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))
+        forty_two.add((y, x - 2))
+        forty_two.add((y, x - 3))
+        forty_two.add((y - 1, x - 3))
+        forty_two.add((y - 2, x - 3))
+        forty_two.add((y + 1, x - 1))
+        forty_two.add((y + 2, x - 1))
+        forty_two.add((y, x + 1))
+        forty_two.add((y, x + 2))
+        forty_two.add((y, x + 3))
+        forty_two.add((y - 1, x + 3))
+        forty_two.add((y - 2, x + 3))
+        forty_two.add((y - 2, x + 2))
+        forty_two.add((y - 2, x + 1))
+        forty_two.add((y + 1, x + 1))
+        forty_two.add((y + 2, x + 1))
+        forty_two.add((y + 2, x + 2))
+        forty_two.add((y + 2, x + 3))
+        return forty_two
+
+    @staticmethod
+    def unperfect_maze(width: int, height: int,
+                       maze: NDArray[Any],
+                       forty_two: set[tuple[int, int]] | None,
+                       prob: float = 0.1
+                       ) -> Generator[NDArray[Any], None, NDArray[Any]]:
+        directions = {
+            "N": (0, -1),
+            "S": (0, 1),
+            "W": (-1, 0),
+            "E": (1, 0)
+        }
+
+        reverse = {
+            "N": "S",
+            "S": "N",
+            "W": "E",
+            "E": "W"
+        }
+        min_break = 2
+        while True:
+            count = 0
+            for y in range(height):
+                for x in range(width):
+                    if forty_two and (x, y) in forty_two:
+                        continue
+                    for direc, (dx, dy) in directions.items():
+                        nx, ny = x + dx, y + dy
+                        if forty_two and (
+                            (y, x) in forty_two
+                            or (ny, nx) in forty_two
+                        ):
+                            continue
+                        if not (0 <= nx < width and 0 < ny < height):
+                            continue
+                        if direc in ["S", "E"]:
+                            continue
+                        if np.random.random() < prob:
+                            count += 1
+                            cell = maze[y][x]
+                            cell_n = maze[ny][nx]
+                            cell = DepthFirstSearch.broken_wall(cell, direc)
+                            cell_n = DepthFirstSearch.broken_wall(cell_n,
+                                                                  reverse[
+                                                                    direc])
+                            maze[y][x] = cell
+                            maze[ny][nx] = cell_n
+                            yield maze
+            if count > min_break:
+                break
+        return maze
 
 
 class Kruskal(MazeGenerator):
+
+    class KruskalSet:
+        def __init__(self, cells: list[int]) -> None:
+            self.cells: list[int] = cells
+
+    class Sets:
+        def __init__(self, sets: list['Kruskal.KruskalSet']) -> None:
+            self.sets = sets
+
     @staticmethod
     def walls_to_maze(
         walls: list[tuple[int, int]], height: int, width: int
-    ) -> np.ndarray:
-        maze: np.ndarray = np.array(
+    ) -> NDArray[Any]:
+        maze: NDArray[Any] = np.array(
             [[Cell(value=0) for _ in range(width)] for _ in range(height)]
         )
         for wall in walls:
@@ -37,66 +129,232 @@ class Kruskal(MazeGenerator):
                 if x == height - 1:
                     maze[x][y].set_south(True)
                 if y == 0:
-                    maze[x][y].set_est(True)
-                if y == width - 1:
                     maze[x][y].set_west(True)
+                if y == width - 1:
+                    maze[x][y].set_est(True)
         return maze
 
     @staticmethod
-    def is_in_same_set(sets: list[list[int]], wall: tuple[int, int]) -> bool:
+    def is_in_same_set(sets: Sets, wall: tuple[int, int]) -> bool:
         a, b = wall
-        for set in sets:
-            if a in set and b in set:
+        for set in sets.sets:
+            if a in set.cells and b in set.cells:
                 return True
-            if a in set or b in set:
+            elif a in set.cells or b in set.cells:
                 return False
         return False
 
     @staticmethod
-    def merge_sets(sets: list[list[int]], wall: tuple[int, int]) -> None:
+    def merge_sets(sets: Sets, wall: tuple[int, int]) -> None:
         a, b = wall
         base_set = None
-        for set in sets:
-            if base_set is None and (a in set or b in set):
-                base_set = set
-            elif base_set and (a in set or b in set):
-                base_set += set
-                sets.remove(set)
+        for i in range(len(sets.sets)):
+            if base_set is None and (
+                a in sets.sets[i].cells or b in sets.sets[i].cells
+            ):
+                base_set = sets.sets[i]
+            elif base_set and (
+                a in sets.sets[i].cells or b in sets.sets[i].cells
+            ):
+                base_set.cells += sets.sets[i].cells
+                sets.sets.pop(i)
+                return
+        raise Exception("two sets not found")
+
+    @staticmethod
+    def touch_ft(
+        width: int,
+        wall: tuple[int, int],
+        cells_ft: None | set[tuple[int, int]],
+    ) -> bool:
+        if cells_ft is None:
+            return False
+        s1 = (math.trunc(wall[0] / width), wall[0] % width)
+        s2 = (math.trunc(wall[1] / width), wall[1] % width)
+        return s1 in cells_ft or s2 in cells_ft
 
-    @classmethod
     def generator(
-        cls, height: int, width: int
-    ) -> Generator[np.ndarray, None, np.ndarray]:
-        sets = [[i] for i in range(height * width)]
+        self, height: int, width: int, seed: int | None = None
+    ) -> Generator[NDArray[Any], None, NDArray[Any]]:
+        cells_ft = None
+        if height > 10 and width > 10:
+            cells_ft = self.get_cell_ft(width, height)
+        if cells_ft and (self.start in cells_ft or self.end in cells_ft):
+            cells_ft = None
+
+        if seed is not None:
+            np.random.seed(seed)
+        sets = self.Sets([self.KruskalSet([i]) for i in range(height * width)])
         walls = []
         for h in range(height):
             for w in range(width - 1):
                 walls += [(w + (width * h), w + (width * h) + 1)]
-        for w in range(width):
-            for h in range(height - 1):
-                walls += [(w + (width * h), w + (width * h) + width)]
+        for h in range(height - 1):
+            for w in range(width):
+                walls += [(w + (width * h), w + (width * (h + 1)))]
         np.random.shuffle(walls)
 
-        yield cls.walls_to_maze(walls, height, width)
-        for wall in walls:
-            if not cls.is_in_same_set(sets, wall):
-                cls.merge_sets(sets, wall)
-                walls.remove(wall)
-                yield cls.walls_to_maze(walls, height, width)
-        return cls.walls_to_maze(walls, height, width)
+        yield self.walls_to_maze(walls, height, width)
+        while (len(sets.sets) != 1 and cells_ft is None) or (
+            len(sets.sets) != 19 and cells_ft is not None
+        ):
+            for wall in walls:
+                if not self.is_in_same_set(sets, wall) and not self.touch_ft(
+                    width, wall, cells_ft
+                ):
+                    self.merge_sets(sets, wall)
+                    walls.remove(wall)
+                    yield self.walls_to_maze(walls, height, width)
+                if (len(sets.sets) == 1 and cells_ft is None) or (
+                    len(sets.sets) == 19 and cells_ft is not None
+                ):
+                    break
+        print(f"nb sets: {len(sets.sets)}")
+        maze = self.walls_to_maze(walls, height, width)
+        if self.perfect is False:
+            gen = Kruskal.unperfect_maze(width, height, maze,
+                                         cells_ft)
+            for res in gen:
+                maze = res
+                yield maze
+        return maze
 
 
-def main():
-    try:
-        for alg in MazeGenerator.Kruskal.kruskal(10, 10):
-            maze = alg
-            # print(maze)
-            # print()
-        print(maze)
+class DepthFirstSearch(MazeGenerator):
+    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[tuple[int, int]] | None = None
 
-    except GeneratorExit as maze:
-        print(maze)
+    def generator(
+        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: 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[tuple[int, int]] = list()
+        w_h = (width, height)
+        coord = (0, 0)
+        x, y = coord
+        first_iteration = True
 
+        while path or first_iteration:
+            first_iteration = False
 
-if __name__ == "__main__":
-    main()
+            visited[y, x] = True
+            path = self.add_cell_visited(coord, path)
+
+            random_c = self.random_cells(visited, coord, w_h)
+
+            if not random_c:
+                path = self.back_on_step(path, w_h, visited)
+                if not path:
+                    break
+                coord = path[-1]
+                random_c = self.random_cells(visited, coord, w_h)
+                x, y = coord
+
+            wall = self.next_step(random_c)
+            maze[y][x] = self.broken_wall(maze[y][x], wall)
+
+            coord = self.next_cell(x, y, wall)
+            wall_r = self.reverse_path(wall)
+            x, y = coord
+            maze[y][x] = self.broken_wall(maze[y][x], wall_r)
+            yield maze
+        if self.perfect is False:
+            gen = DepthFirstSearch.unperfect_maze(width, height, maze,
+                                                  self.forty_two)
+            for res in gen:
+                maze = res
+                yield maze
+        return maze
+
+    @staticmethod
+    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[int, int], path: list[tuple[int, int]]
+                         ) -> list[tuple[int, int]]:
+        path.append(coord)
+        return path
+
+    @staticmethod
+    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
+
+        if y - 1 >= 0 and not visited[y - 1][x]:
+            rand_cell.append("N")
+
+        if y + 1 < height and not visited[y + 1][x]:
+            rand_cell.append("S")
+
+        if x - 1 >= 0 and not visited[y][x - 1]:
+            rand_cell.append("W")
+
+        if x + 1 < width and not visited[y][x + 1]:
+            rand_cell.append("E")
+        return rand_cell
+
+    @staticmethod
+    def next_step(rand_cell: list[str]) -> str:
+        return random.choice(rand_cell)
+
+    @staticmethod
+    def broken_wall(cell: Cell, wall: str) -> Cell:
+        if wall == "N":
+            cell.set_north(False)
+        elif wall == "S":
+            cell.set_south(False)
+        elif wall == "W":
+            cell.set_west(False)
+        elif wall == "E":
+            cell.set_est(False)
+        return cell
+
+    @staticmethod
+    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)
+
+    @staticmethod
+    def reverse_path(direction: str) -> str:
+        return {"N": "S", "S": "N", "W": "E", "E": "W"}[direction]
+
+    @staticmethod
+    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):
+                break
+            path.pop()
+        return path
+
+    @staticmethod
+    def lock_cell_ft(
+        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
+        return visited

src/amaz_lib/MazeSolver.py

@@ -1,8 +1,255 @@
 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):
+    def __init__(self, start: tuple[int, int], end: tuple[int, int]) -> None:
+        self.start = (start[1] - 1, start[0] - 1)
+        self.end = (end[1] - 1, end[0] - 1)
+
     @abstractmethod
-    @classmethod
-    def solve(cls, maze: Maze) -> 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 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 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: tuple[int, int], end: tuple[int, int]):
+        super().__init__(start, end)
+
+    def solve(
+        self, maze: Maze, height: int | None = None, width: int | None = None
+    ) -> str:
+        path_str = ""
+        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: tuple[int, int] = (height, width)
+        while coord != self.end:
+            visited[coord] = True
+            path.append(coord)
+            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
+                )
+                if not path:
+                    break
+                coord = path[-1]
+                rand_p = self.random_path(visited, coord, maze_s, h_w)
+            next = self.next_path(rand_p)
+            move.append(next)
+            coord = self.next_cell(coord, next)
+        for m in move:
+            path_str += m
+        if not path:
+            raise Exception("Path not found")
+        return path_str
+
+    @staticmethod
+    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
+
+        if y - 1 >= 0 and not maze[y][x].get_north() and not visited[y - 1][x]:
+            random_p.append("N")
+
+        if y + 1 < h and not maze[y][x].get_south() and not visited[y + 1][x]:
+            random_p.append("S")
+
+        if x - 1 >= 0 and not maze[y][x].get_west() and not visited[y][x - 1]:
+            random_p.append("W")
+
+        if x + 1 < w and not maze[y][x].get_est() and not visited[y][x + 1]:
+            random_p.append("E")
+        return random_p
+
+    @staticmethod
+    def next_path(rand_path: list[str]) -> str:
+        return random.choice(rand_path)
+
+    @staticmethod
+    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):
+                break
+            path.pop()
+            move.pop()
+        return path, move
+
+    @staticmethod
+    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]
+        return (y + add_y, x + add_x)

src/amaz_lib/__init__.py

@@ -1,8 +1,10 @@
 from .Cell import Cell
 from .Maze import Maze
-from .MazeGenerator import MazeGenerator
-from .MazeSolver import MazeSolver
+from .MazeGenerator import MazeGenerator, DepthFirstSearch
+from .MazeGenerator import Kruskal
+from .MazeSolver import MazeSolver, AStar, DepthFirstSearchSolver
 
 __version__ = "1.0.0"
 __author__ = "us"
-__all__ = ["Cell", "Maze", "MazeGenerator", "MazeSolver"]
+__all__ = ["Cell", "Maze", "MazeGenerator", "DepthFirstSearchSolver",
+           "MazeSolver", "AStar", "Kruskal", "DepthFirstSearch"]

src/parsing/Parsing.py

@@ -0,0 +1,128 @@
+from ..amaz_lib import DepthFirstSearch, Kruskal
+from ..amaz_lib import AStar, DepthFirstSearchSolver
+from typing import Any
+
+
+class DataMaze:
+
+    @staticmethod
+    def get_file_data(name_file: str) -> str:
+        with open(name_file, "r") as file:
+            data = file.read()
+        if data == "":
+            raise ValueError("The file is empty")
+        return data
+
+    @staticmethod
+    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[str, str]) -> None:
+        key_test = {
+            "WIDTH",
+            "HEIGHT",
+            "ENTRY",
+            "EXIT",
+            "OUTPUT_FILE",
+            "PERFECT",
+            "GENERATOR",
+            "SOLVER",
+        }
+        set_key = {key for key in data.keys()}
+        if len(set_key) != len(key_test):
+            raise KeyError("Missing some data the len do not correspond")
+        res_key = {key for key in set_key if key not in key_test}
+        if len(res_key) != 0:
+            raise KeyError(
+                "Some Key " f"do not correspond the keys: {res_key}"
+            )
+
+    @staticmethod
+    def convert_values(data: dict[str, str]) -> dict[str, Any]:
+        key_int = {"WIDTH", "HEIGHT"}
+        key_tuple = {"ENTRY", "EXIT"}
+        key_bool = {"PERFECT"}
+        res: dict[str, Any] = {}
+        for key in key_int:
+            res.update({key: int(data[key])})
+        for key in key_tuple:
+            res.update({key: DataMaze.convert_tuple(data[key])})
+        for key in key_bool:
+            res.update({key: DataMaze.convert_bool(data[key])})
+        res.update({"OUTPUT_FILE": data["OUTPUT_FILE"]})
+        res.update(
+            DataMaze.get_solver_generator(data, res["ENTRY"], res["EXIT"],
+                                          res["PERFECT"])
+        )
+        return res
+
+    @staticmethod
+    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: dict[str, Any] = {
+            "AStar": AStar,
+            "DFS": DepthFirstSearchSolver
+        }
+        res = {}
+        res["GENERATOR"] = available_generator[data["GENERATOR"]](entry, exit,
+                                                                  perfect)
+        res["SOLVER"] = available_solver[data["SOLVER"]](entry, exit)
+        return res
+
+    @staticmethod
+    def convert_tuple(data: str) -> tuple[int, int]:
+        data_t = data.split(",")
+        if len(data_t) != 2:
+            raise ValueError(
+                "There is too much " "argument in the coordinate given"
+            )
+        x, y = data_t
+        tup = (int(x), int(y))
+        return tup
+
+    @staticmethod
+    def convert_bool(data: str) -> bool:
+        if data != "True" and data != "False":
+            raise ValueError("This is not True or False")
+        if data == "True":
+            return True
+        return False
+
+    @staticmethod
+    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)
+            DataMaze.verif_key_data(data_dict)
+            data_maze = DataMaze.convert_values(data_dict)
+            return {k.lower(): v for k, v in data_maze.items()}
+        except FileNotFoundError:
+            print("The file do not exist")
+            exit()
+        except PermissionError:
+            print("We dont have the Permission")
+            exit()
+        except ValueError as e:
+            print(f"Error during the convert or the file is empty: {e}")
+            exit()
+        except KeyError as e:
+            print(f"Error on the key in the file: {e}")
+            exit()
+        except IndexError as e:
+            print(
+                "In the function transform Data some data cannot "
+                f"be splited by '=' because '=' was not present: {e}"
+            )
+            exit()
+        except AttributeError as e:
+            print("Error on the " f"funciton get_data_maze : {e}")
+            exit()

src/parsing/__init__.py

@@ -0,0 +1,6 @@
+__version__ = "1.0.0"
+__author__ = "mteriier, dgaillet"
+
+from .Parsing import DataMaze
+
+__all__ = ["DataMaze"]

test.txt

@@ -1,23 +0,0 @@
-7D53BFD3D57951517D1D
-3D12C3903BD03AD4178D
-2BAEBEEEAA92EED547C9
-2287ED17AAAC5393FFF0
-6C6951292A87D2AEBD30
-37D43E8686E93AABAB8C
-21516D2D47FEE8284049
-6C7857C3FB9116C696D8
-751453D6D2AAC57BE970
-3BA952D17EA83BD05470
-22AAD2907BAE86967B74
-2AA83C2EFC69696FBC35
-686EE96FD7D4783FAD21
-7ED17ED3D57D3EC52FA0
-7B943D16FB7BABD3AFC8
-7407C5297EB82EB84174
-392D53C6912EE9447E9D
-62A952BBAAC13EFD7B89
-3AAC3EC6EABAAD557824
-66C7C7D7D6C6C7D556CD
-
-1,1
-16,15

tests/test_Cell.py

@@ -0,0 +1,30 @@
+from amaz_lib.Cell import Cell
+
+
+def test_cell_setter_getter() -> None:
+    cell = Cell(value=0)
+
+    cell.set_north(True)
+    assert cell.get_north() is True
+    cell.set_north(False)
+    assert cell.get_north() is False
+
+    cell.set_est(True)
+    assert cell.get_est() is True
+    cell.set_est(False)
+    assert cell.get_est() is False
+
+    cell.set_south(True)
+    assert cell.get_south() is True
+    cell.set_south(False)
+    assert cell.get_south() is False
+
+    cell.set_west(True)
+    assert cell.get_west() is True
+    cell.set_west(False)
+    assert cell.get_west() is False
+
+    cell.set_value(8)
+    assert cell.get_value() == 8
+    cell.set_value(0)
+    assert cell.get_value() == 0

tests/test_Depth.py

@@ -0,0 +1,27 @@
+from amaz_lib.MazeGenerator import DepthFirstSearch
+from amaz_lib.Cell import Cell
+import numpy as np
+
+
+class TestDepth:
+
+    def test_init_maze(self) -> None:
+        maze = DepthFirstSearch.init_maze(10, 10)
+        cell = Cell(value=15)
+        maze[1][1].set_est(False)
+        assert maze[0][0].value == cell.value
+
+    def test_rand_cells(self) -> None:
+        w_h = (10, 10)
+        lst = np.zeros((10, 10), dtype=bool)
+        lst[0, 0] = True
+        rand_cells = DepthFirstSearch.random_cells(lst, (0, 1), w_h)
+        assert len(rand_cells) == 2
+
+    def test_next_cell(self) -> None:
+        coord = (5, 4)
+        x, y = coord
+        assert DepthFirstSearch.next_cell(x, y, "N") == (2, 3)
+
+    def test_reverse_path(self) -> None:
+        assert DepthFirstSearch.reverse_path("N") == "S"

tests/test_Maze.py

@@ -0,0 +1,33 @@
+import numpy
+from amaz_lib.Cell import Cell
+from amaz_lib.Maze import Maze
+
+
+def test_maze_setter_getter() -> None:
+    maze = Maze(numpy.array([]))
+
+    test = numpy.array(
+        [
+            [Cell(value=6), Cell(value=8), Cell(value=11)],
+            [Cell(value=6), Cell(value=8), Cell(value=11)],
+            [Cell(value=6), Cell(value=8), Cell(value=11)],
+        ]
+    )
+
+    maze.set_maze(test)
+    m = maze.get_maze()
+    assert m is not None
+    assert numpy.array_equal(m, test) is True
+
+
+def test_maze_str() -> None:
+    test = numpy.array(
+        [
+            [Cell(value=6), Cell(value=8), Cell(value=11)],
+            [Cell(value=6), Cell(value=8), Cell(value=11)],
+            [Cell(value=6), Cell(value=8), Cell(value=11)],
+        ]
+    )
+    maze = Maze(test)
+
+    assert maze.__str__() == "68B\n68B\n68B\n"

tests/test_MazeGenerator.py

@@ -0,0 +1,14 @@
+import numpy
+from amaz_lib.MazeGenerator import DepthFirstSearch
+
+
+class TestMazeGenerator:
+
+    def test_generator(self) -> None:
+        w_h = (10, 10)
+        maze = numpy.array([])
+        generator = DepthFirstSearch((1, 1), (2, 2), True).generator(*w_h)
+        for output in generator:
+            maze = output
+
+        assert maze.shape == w_h

tests/test_MazeSolver.py

@@ -0,0 +1,19 @@
+from amaz_lib.Cell import Cell
+import numpy as np
+from amaz_lib import AStar, Maze
+
+
+def test_solver() -> None:
+    maze = Maze(
+        np.array(
+            [
+                [Cell(value=13), Cell(value=3), Cell(value=11)],
+                [Cell(value=9), Cell(value=4), Cell(value=6)],
+                [Cell(value=12), Cell(value=5), Cell(value=7)],
+            ]
+        )
+    )
+    print(maze)
+    solver = AStar((1, 1), (3, 3))
+    res = solver.solve(maze)
+    assert res == "ESWSEE"

tests/test_parsing.py

@@ -0,0 +1,78 @@
+from parsing.Parsing import DataMaze
+import pytest
+
+
+class TestParsing:
+
+    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) -> None:
+        with pytest.raises(FileNotFoundError):
+            DataMaze.get_file_data("tete")
+
+    # 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) -> None:
+        with pytest.raises(ValueError):
+            DataMaze.get_file_data("tests/test_txt/error_6.txt")
+
+    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) -> None:
+        with pytest.raises(IndexError):
+            DataMaze.transform_data("asdasdasdasdasdasda\nasdasdas=asdasd")
+
+    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) -> 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) -> 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) -> None:
+        with pytest.raises(ValueError):
+            DataMaze.convert_tuple("0,3,5,5")
+
+    def test_tuple_error1(self) -> None:
+        with pytest.raises(AttributeError):
+            DataMaze.convert_tuple("None")
+
+    def test_bool_error(self) -> None:
+        with pytest.raises(ValueError):
+            DataMaze.convert_bool("Trueeee")
+
+    def test_valid_tuple(self) -> None:
+        assert DataMaze.convert_tuple("7534564654, 78") == (7534564654, 78)
+
+    def test_valid_bool(self) -> None:
+        assert DataMaze.convert_bool("False") is False
+
+    def test_valid_bool1(self) -> None:
+        assert DataMaze.convert_bool("True") is True
+
+    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
+        assert data["ENTRY"] == (0, 0)
+        assert data["EXIT"] == (19, 14)
+        assert data["OUTPUT_FILE"] == "maze.txt"
+        assert data["PERFECT"] is True

tests/test_txt/config_1.txt

@@ -0,0 +1,6 @@
+WIDTH=200
+HEIGHT=100
+ENTRY=0,0
+EXIT=19,14
+OUTPUT_FILE=maze.txt
+PERFECT=True

tests/test_txt/error_1.txt

@@ -0,0 +1,6 @@
+WIDTH=200
+HEIGHT=100
+ENTRY=0,0
+EXIT=19,14
+OUTPUT_FILE=maze.txt
+PERFECT=True

tests/test_txt/error_2.txt

@@ -0,0 +1,6 @@
+WIDTH=caca
+HEIGHT=100
+ENTRY=0,0
+EXIT=19,14
+OUTPUT_FILE=maze.txt
+PERFECT=True

tests/test_txt/error_8.txt

@@ -0,0 +1,4 @@
+WIDTH=200
+HEIGHT=100
+ENTRY=0,0
+EXIT=19,14

tests/test_txt/error_9.txt

@@ -0,0 +1,7 @@
+WIDTH=200
+HEIGHT=100
+ENTRY=0,0
+EXIT=19,14
+OUTPUT_FILE=maze.txt
+PERFECT=True
+PIPI=tut

uv.lock

@@ -20,6 +20,7 @@ dependencies = [
 dev = [
     { name = "flake8" },
     { name = "mypy" },
+    { name = "pytest" },
 ]
 
 [package.metadata]
@@ -32,6 +33,7 @@ requires-dist = [
 dev = [
     { name = "flake8", specifier = ">=7.3.0" },
     { name = "mypy", specifier = ">=1.19.1" },
+    { name = "pytest", specifier = ">=9.0.2" },
 ]
 
 [[package]]
@@ -43,6 +45,27 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/78/b6/6307fbef88d9b5ee7421e68d78a9f162e0da4900bc5f5793f6d3d0e34fb8/annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53", size = 13643, upload-time = "2024-05-20T21:33:24.1Z" },
 ]
 
+[[package]]
+name = "colorama"
+version = "0.4.6"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697, upload-time = "2022-10-25T02:36:22.414Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" },
+]
+
+[[package]]
+name = "exceptiongroup"
+version = "1.3.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "typing-extensions", marker = "python_full_version < '3.11'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/50/79/66800aadf48771f6b62f7eb014e352e5d06856655206165d775e675a02c9/exceptiongroup-1.3.1.tar.gz", hash = "sha256:8b412432c6055b0b7d14c310000ae93352ed6754f70fa8f7c34141f91c4e3219", size = 30371, upload-time = "2025-11-21T23:01:54.787Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/8a/0e/97c33bf5009bdbac74fd2beace167cab3f978feb69cc36f1ef79360d6c4e/exceptiongroup-1.3.1-py3-none-any.whl", hash = "sha256:a7a39a3bd276781e98394987d3a5701d0c4edffb633bb7a5144577f82c773598", size = 16740, upload-time = "2025-11-21T23:01:53.443Z" },
+]
+
 [[package]]
 name = "flake8"
 version = "7.3.0"
@@ -57,6 +80,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl", hash = "sha256:b9696257b9ce8beb888cdbe31cf885c90d31928fe202be0889a7cdafad32f01e", size = 57922, upload-time = "2025-06-20T19:31:34.425Z" },
 ]
 
+[[package]]
+name = "iniconfig"
+version = "2.3.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" },
+]
+
 [[package]]
 name = "librt"
 version = "0.8.1"
@@ -353,6 +385,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/57/a7/b35835e278c18b85206834b3aa3abe68e77a98769c59233d1f6300284781/numpy-2.4.3-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:4b42639cdde6d24e732ff823a3fa5b701d8acad89c4142bc1d0bd6dc85200ba5", size = 12504685, upload-time = "2026-03-09T07:58:50.525Z" },
 ]
 
+[[package]]
+name = "packaging"
+version = "26.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/65/ee/299d360cdc32edc7d2cf530f3accf79c4fca01e96ffc950d8a52213bd8e4/packaging-26.0.tar.gz", hash = "sha256:00243ae351a257117b6a241061796684b084ed1c516a08c48a3f7e147a9d80b4", size = 143416, upload-time = "2026-01-21T20:50:39.064Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b7/b9/c538f279a4e237a006a2c98387d081e9eb060d203d8ed34467cc0f0b9b53/packaging-26.0-py3-none-any.whl", hash = "sha256:b36f1fef9334a5588b4166f8bcd26a14e521f2b55e6b9de3aaa80d3ff7a37529", size = 74366, upload-time = "2026-01-21T20:50:37.788Z" },
+]
+
 [[package]]
 name = "pathspec"
 version = "1.0.4"
@@ -362,6 +403,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ef/3c/2c197d226f9ea224a9ab8d197933f9da0ae0aac5b6e0f884e2b8d9c8e9f7/pathspec-1.0.4-py3-none-any.whl", hash = "sha256:fb6ae2fd4e7c921a165808a552060e722767cfa526f99ca5156ed2ce45a5c723", size = 55206, upload-time = "2026-01-27T03:59:45.137Z" },
 ]
 
+[[package]]
+name = "pluggy"
+version = "1.6.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412, upload-time = "2025-05-15T12:30:07.975Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" },
+]
+
 [[package]]
 name = "pycodestyle"
 version = "2.14.0"
@@ -513,6 +563,33 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/c2/2f/81d580a0fb83baeb066698975cb14a618bdbed7720678566f1b046a95fe8/pyflakes-3.4.0-py2.py3-none-any.whl", hash = "sha256:f742a7dbd0d9cb9ea41e9a24a918996e8170c799fa528688d40dd582c8265f4f", size = 63551, upload-time = "2025-06-20T18:45:26.937Z" },
 ]
 
+[[package]]
+name = "pygments"
+version = "2.19.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/b0/77/a5b8c569bf593b0140bde72ea885a803b82086995367bf2037de0159d924/pygments-2.19.2.tar.gz", hash = "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887", size = 4968631, upload-time = "2025-06-21T13:39:12.283Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b", size = 1225217, upload-time = "2025-06-21T13:39:07.939Z" },
+]
+
+[[package]]
+name = "pytest"
+version = "9.0.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "exceptiongroup", marker = "python_full_version < '3.11'" },
+    { name = "iniconfig" },
+    { name = "packaging" },
+    { name = "pluggy" },
+    { name = "pygments" },
+    { name = "tomli", marker = "python_full_version < '3.11'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/d1/db/7ef3487e0fb0049ddb5ce41d3a49c235bf9ad299b6a25d5780a89f19230f/pytest-9.0.2.tar.gz", hash = "sha256:75186651a92bd89611d1d9fc20f0b4345fd827c41ccd5c299a868a05d70edf11", size = 1568901, upload-time = "2025-12-06T21:30:51.014Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/3b/ab/b3226f0bd7cdcf710fbede2b3548584366da3b19b5021e74f5bde2a8fa3f/pytest-9.0.2-py3-none-any.whl", hash = "sha256:711ffd45bf766d5264d487b917733b453d917afd2b0ad65223959f59089f875b", size = 374801, upload-time = "2025-12-06T21:30:49.154Z" },
+]
+
 [[package]]
 name = "tomli"
 version = "2.4.0"