fix(astar): the actual astar wasn't the real astar algoritm

a_maze_ing.py

@@ -1,9 +1,10 @@
-from typing import Any
+from typing import Any, Generator
 from src.AMazeIng import AMazeIng
 from src.parsing import Parsing
-from mlx.mlx import Mlx
+from mlx import Mlx
 import numpy as np
 import math
+import time
 
 
 class MazeMLX:
@@ -12,18 +13,33 @@ class MazeMLX:
         self.height = height
         self.width = width
         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 = (
             self.mlx.mlx_get_data_addr(self.img_ptr)
         )
+        self.path_printer = None
+        self.generator = None
 
     def close(self) -> None:
         self.mlx.mlx_destroy_image(self.mlx_ptr, self.img_ptr)
 
+    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, y) -> None:
         offset = y * self.size_line + x * (self.bpp // 8)
 
@@ -35,7 +51,6 @@ class MazeMLX:
 
     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:
         sx, sy = start
@@ -75,28 +90,116 @@ 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.redraw_image()
-            self.mlx_ptr, self.win_ptr, self.img_ptr, 0, 0)
+
+    def put_block(self, ul: tuple[int, int], dr: tuple[int, int]) -> 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))
+
+    def put_path(self, amazing: AMazeIng):
+        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
+        margin = math.trunc(
+            math.sqrt(self.width if self.width > self.height else self.height)
+            // 2
+        )
+        cell_size = math.trunc(
+            (
+                (self.height - margin) // len(maze)
+                if self.height > self.width
+                else (self.width - margin) // len(maze[0])
+            )
+        )
+        self.update_maze(maze)
+        for i in range(len(path)):
+            ul = (
+                (actual[0]) * cell_size + margin + 12,
+                (actual[1]) * cell_size + 12 + margin,
+            )
+            dr = (
+                (actual[0]) * cell_size + cell_size + margin - 12,
+                (actual[1]) * cell_size + cell_size - 12 + margin,
+            )
+            self.put_block(ul, dr)
+            self.redraw_image()
+            x0 = actual[0] * cell_size + margin + 12
+            y0 = actual[1] * cell_size + margin + 12
+            x1 = actual[0] * cell_size + cell_size + margin - 12
+            y1 = actual[1] * cell_size + cell_size + margin - 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]) * cell_size + margin + 12,
+            (actual[1]) * cell_size + 12 + margin,
+        )
+        dr = (
+            (actual[0]) * cell_size + cell_size + margin - 12,
+            (actual[1]) * cell_size + cell_size - 12 + margin,
+        )
+        self.put_block(ul, dr)
+        self.redraw_image()
+        return
 
     def close_loop(self, _: Any):
         self.mlx.mlx_loop_exit(self.mlx_ptr)
 
-    def gen_maze(self, amazing: AMazeIng) -> None:
+    def handle_key_press(self, keycode: int, amazing: AMazeIng) -> None:
-        self.generator = amazing.generate()
+        if keycode == 49:
+            self.restart_maze(amazing)
+        if keycode == 50:
+            self.restart_path(amazing)
+        if keycode == 51:
+            pass
+        if keycode == 52:
+            self.close_loop(None)
 
     def start(self, amazing: AMazeIng) -> None:
-        self.gen_maze(amazing)
+        self.restart_maze(amazing)
-        self.mlx.mlx_loop_hook(self.mlx_ptr, self.render, amazing)
+        self.mlx.mlx_loop_hook(self.mlx_ptr, self.render_maze, 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 render(self, amazing: AMazeIng):
+    def restart_maze(self, amazing: AMazeIng) -> None:
+        self.generator = amazing.generate()
+
+    def restart_path(self, amazing: AMazeIng) -> None:
+        self.path_printer = self.put_path(amazing)
+
+    def render_path(self):
+        try:
+            next(self.path_printer)
+            time.sleep(0.03)
+        except StopIteration:
+            pass
+
+    def render_maze(self, amazing: AMazeIng):
         try:
             next(self.generator)
             self.update_maze(amazing.maze.get_maze())
             # time.sleep(0.01)
         except StopIteration:
-            pass
+            if self.path_printer is not None:
+                self.render_path()
 
 
 def main() -> None:

config.txt

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

src/AMazeIng.py

@@ -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
 

src/amaz_lib/MazeSolver.py

@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 from .Maze import Maze
+from typing import Any
 import numpy as np
 
 
@@ -15,135 +16,155 @@ class MazeSolver(ABC):
 
 
 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)
         self.path = []
 
-    def f(self, n):
+    def g(self, n: tuple[int, int]) -> int:
-        def g() -> int:
+        return len(self.path) + 1
-            return len(self.path) + 1
 
-        def h(n: tuple[int, int]) -> int:
+    def h(self, n: tuple[int, int]) -> int:
-            return (
+        return (
-                max(n[0], self.end[0])
+            max(n[0], self.end[0])
-                - min(n[0], self.end[0])
+            - min(n[0], self.end[0])
-                + max(n[1], self.end[1])
+            + max(n[1], self.end[1])
-                - min(n[1], self.end[1])
+            - min(n[1], self.end[1])
-            )
+        )
 
-        return g() + h(n)
+    def f(self, n: tuple[int, int]) -> int:
+        return self.g(n) + self.h(n)
 
-    def best_path(
+    def get_paths(
         self,
         maze: np.ndarray,
         actual: tuple[int, int],
-        last: str | None,
+        close: list,
-    ) -> dict[str, int]:
+    ) -> list[tuple[int, int]]:
-        path = {
+        path = [
-            "N": (
+            (
-                self.f((actual[0], actual[1] - 1))
+                (actual[0], actual[1] - 1)
-                if not maze[actual[1]][actual[0]].get_north() and actual[1] > 0
+                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
             ),
-            "E": (
+            (
-                self.f((actual[0] + 1, actual[1]))
+                (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
             ),
-            "S": (
+            (
-                self.f((actual[0], actual[1] + 1))
+                (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
             ),
-            "W": (
+            (
-                self.f((actual[0] - 1, actual[1]))
+                (actual[0] - 1, actual[1])
-                if not maze[actual[1]][actual[0]].get_west() and actual[0] > 0
+                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 {
+        return [p for p in path if p is not None]
-            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:
+    def get_path(self, maze: np.ndarray) -> list:
-        match dir:
+        open: list[AStar.Node] = []
-            case "N":
+        close: list[AStar.Node] = []
-                return "S"
-            case "E":
-                return "W"
-            case "S":
-                return "N"
-            case "W":
-                return "E"
-            case _:
-                return ""
 
-    def get_next_pos(
+        open.append(
-        self, dir: str, actual: tuple[int, int]
+            AStar.Node(
-    ) -> tuple[int, int]:
+                self.start,
-        match dir:
+                0,
-            case "N":
+                self.h(self.start),
-                return (actual[0], actual[1] - 1)
+                self.f(self.start),
-            case "E":
+                None,
-                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:
-        self.path = [(self.start, self.best_path(maze, self.start, None))]
-        visited = [self.start]
-        while len(self.path) > 0 and self.path[-1][0] != self.end:
-            if len(self.path[-1][1]) == 0:
-                self.path.pop(-1)
-                if len(self.path) == 0:
-                    break
-                k = next(iter(self.path[-1][1]))
-                self.path[-1][1].pop(k)
-                continue
-
-            while len(self.path[-1][1]) > 0:
-                next_pos = self.get_next_pos(
-                    list(self.path[-1][1].keys())[0], self.path[-1][0]
-                )
-                if next_pos in visited:
-                    k = next(iter(self.path[-1][1]))
-                    self.path[-1][1].pop(k)
-                else:
-                    break
-            if len(self.path[-1][1]) == 0:
-                self.path.pop(-1)
-                continue
-
-            pre = self.get_opposit(list(self.path[-1][1].keys())[0])
-            self.path.append(
-                (
-                    next_pos,
-                    self.best_path(maze, next_pos, pre),
-                )
             )
-            visited += [next_pos]
-        if len(self.path) == 0:
-            return None
-        self.path[-1] = (self.end, {})
-        return "".join(
-            str(list(c[1].keys())[0]) for c in self.path if len(c[1]) > 0
         )
 
-    def solve(self, maze: Maze, height: int = None, width: int = None) -> str:
+        while len(open) > 0:
-        res = self.get_path(maze.get_maze())
+            to_check = sorted(open, key=lambda x: x.f)[0]
-        if res is None:
+            open.remove(to_check)
-            raise Exception("Path not found")
+            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) -> 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, width: int = None) -> str:
+        path = self.get_path(maze.get_maze())
+        return self.translate(path)
+
 
 class DepthFirstSearchSolver(MazeSolver):
     def __init__(self, start, end):

test.txt

@@ -1,19 +0,0 @@
-D53939553D13B93
-93AAC697A92C6AA
-AC6A95056AE956A
-A916856D1454152
-A843C5394555696
-A87AF96AFFFB96B
-AE96FC5457F8412
-C52BFFFBFFFC102
-B94453FAFD516EA
-86953AFAFFFA956
-81692C54153A853
-AC3A83950546C3A
-ABA86C2D69517C2
-C2AC55293ABC53A
-D6C55546C4457C6
-
-1,1
-2,2
-EESSWN