da7e/amazing
1
0
Fork 0
mirror of https://github.com/maoakeEnterprise/amazing.git synced 2026-04-28 16:04:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix astar algorithm work

Browse Source
This commit is contained in:
David GAILLETON
2026-03-25 14:51:12 +01:00
parent 991cdead51
commit c6242eeec0
1 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amaz_lib/MazeSolver.py
+56 -17
View File
@@ -5,8 +5,8 @@ import numpy as np
class MazeSolver(ABC): class MazeSolver(ABC):
def __init__(self, start: tuple[int, int], end: tuple[int, int]) -> None: def __init__(self, start: tuple[int, int], end: tuple[int, int]) -> None:
self.start = (start[0] - 1, start[1] - 1) self.start = (start[1] - 1, start[0] - 1)
self.end = (end[0] - 1, end[1] - 1) self.end = (end[1] - 1, end[0] - 1)
@abstractmethod @abstractmethod
def solve(self, maze: Maze) -> str: ... def solve(self, maze: Maze) -> str: ...
@@ -48,35 +48,39 @@ class AStar(MazeSolver):
return 1000 return 1000
def best_path( def best_path(
self, maze: np.ndarray, actual: tuple[int, int] self,
) -> dict[str, int | None]: maze: np.ndarray,
print(actual) actual: tuple[int, int],
last: str | None,
) -> dict[str, int]:
path = { path = {
"N": ( "N": (
self.f((actual[1] - 1, actual[0])) self.f((actual[0], actual[1] - 1))
if not maze[actual[1]][actual[0]].get_north() and actual[0] > 0 if not maze[actual[1]][actual[0]].get_north() and actual[1] > 0
else None else None
), ),
"E": ( "E": (
self.f((actual[1], actual[0] + 1)) self.f((actual[0] + 1, actual[1]))
if not maze[actual[1]][actual[0]].get_est() if not maze[actual[1]][actual[0]].get_est()
and actual[1] < len(maze) - 1 and actual[0] < len(maze[0]) - 1
else None else None
), ),
"S": ( "S": (
self.f((actual[1] + 1, actual[0])) self.f((actual[0], actual[1] + 1))
if not maze[actual[1]][actual[0]].get_south() if not maze[actual[1]][actual[0]].get_south()
and actual[0] < len(maze) - 1 and actual[1] < len(maze) - 1
else None else None
), ),
"W": ( "W": (
self.f((actual[1], actual[0] - 1)) self.f((actual[0] - 1, actual[1]))
if not maze[actual[1]][actual[0]].get_west() and actual[1] > 0 if not maze[actual[1]][actual[0]].get_west() and actual[0] > 0
else None else None
), ),
} }
return { return {
k: v for k, v in sorted(path.items(), key=lambda item: item[0]) 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_opposit(self, dir: str) -> str:
@@ -108,14 +112,49 @@ class AStar(MazeSolver):
return actual return actual
def get_path(self, maze: np.ndarray) -> str | None: def get_path(self, maze: np.ndarray) -> str | None:
actual = self.start path = [(self.start, self.best_path(maze, self.start, None))]
path = "" visited = [self.start]
while len(path) > 0 and path[-1][0] != self.end:
print(path[-1])
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 return None
path[-1] = (self.end, {})
return "".join(
str(list(c[1].keys())[0]) for c in path if len(c[1]) > 0
)
def solve(self, maze: Maze) -> str: def solve(self, maze: Maze) -> str:
print(maze) print(maze)
res = self.get_path(self.start, maze.get_maze(), None) res = self.get_path(maze.get_maze())
if res is None: if res is None:
raise Exception("Path not found") raise Exception("Path not found")
return res return res