updated agent navigation

This commit is contained in:
2021-09-15 21:24:34 +01:00
parent acd39d4403
commit 3d36b913b9
3 changed files with 180 additions and 43 deletions

64
maze.py
View File

@@ -16,16 +16,51 @@ class Wall(NamedTuple):
class Maze:
def __init__(self, width: int, height: int):
self.distance_map = dict()
self.cells = set(Cell(*c) for c in product(range(width), range(height)))
self.maze = dict()
for cell in self.cells:
self.maze[cell] = self.get_neighbours(cell)
self.walls = self.get_walls()
self.generate_maze()
self.remove_blocked_links()
self.build_map()
self.visited = set()
self.dead_ends = dict()
self.dead_end_limit = 5
def get_neighbours(self, cell: Cell) -> Set[Cell]:
def check_dead_end(self, cell: Cell) -> bool:
# return true is new dead end
if cell in self.dead_ends:
return False
if len(self.maze[cell]) == 1:
self.dead_ends[cell] = 0
return True
def build_map(self):
distance = 0
first_cell = max(self.cells)
visited = set()
visited.add(first_cell)
unvisited = self.cells.copy()
unvisited.remove(first_cell)
self.distance_map[first_cell] = 0
current_group = self.maze[first_cell]
while unvisited:
next_group = set()
distance += 1
for node in current_group:
self.distance_map[node] = distance
next_group.update(self.maze[node])
visited.add(node)
unvisited.remove(node)
current_group = next_group.difference(visited)
def get_neighbours(self, cell: Cell) -> List[Cell]:
diffs = ((0, 1), (0, -1), (1, 0), (-1, 0))
return set(Cell(cell.x + x, cell.y + y) for x, y in diffs if Cell(cell.x + x, cell.y + y) in self.cells)
return list(Cell(cell.x + x, cell.y + y) for x, y in diffs if Cell(cell.x + x, cell.y + y) in self.cells)
def get_walls(self) -> Set[Wall]:
walls = set()
@@ -33,6 +68,12 @@ class Maze:
walls.update(set(Wall(*sorted([cell, c])) for c in self.maze[cell]))
return walls
def remove_blocked_links(self):
for wall in self.walls:
cell1, cell2 = wall
self.maze[cell1].remove(cell2)
self.maze[cell2].remove(cell1)
def generate_maze(self) -> None:
visited = set()
unvisited = list(self.cells)
@@ -50,25 +91,6 @@ class Maze:
pass
node = random_neighbour
def generate_prim_maze(self) -> None:
visited = set()
node = random.choice(list(self.cells))
visited.add(node)
removed_walls = set()
wall_list = [w for w in self.walls if node in w]
while wall_list:
random_wall = random.choice(wall_list)
wall_list.remove(random_wall)
cell1, cell2 = random_wall
if (cell1 in visited) != (cell2 in visited):
removed_walls.add(random_wall)
self.walls.remove(random_wall)
visited.add(cell1)
visited.add(cell2)
wall_list.extend(
set(w for w in self.walls if (cell1 in w) or (cell2 in w)).difference(removed_walls)
)
if __name__ == "__main__":
maze = Maze(3, 3)