s452730/Projekt_KELNER
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

A* - poprawa błędów

Browse Source
This commit is contained in:
Łukasz Kinder 2022-04-28 14:42:32 +02:00
parent 3188f3e7f6
commit 84e66ab30f
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tiles.py
View File

@ -314,7 +314,6 @@ def astar(map, start, end):
open_list.pop(current_index) open_list.pop(current_index)
closed_list.append(current_tile) closed_list.append(current_tile)
if current_tile == end_tile: if current_tile == end_tile:
path = [] path = []
current = current_tile current = current_tile
@ -330,23 +329,22 @@ def astar(map, start, end):
continue continue
new_node = Tile(current_tile, tile_position) new_node = Tile(current_tile, tile_position)
children.append(new_node) children.append(new_node)
for child in children: for child in children:
skip = False
for closed_child in closed_list: for closed_child in closed_list:
if child == closed_child: if child == closed_child:
continue skip = True
if skip is False:
child.g = current_tile.g + map[child.position[0]][child.position[1]] child.g = map[child.position[0]][child.position[1]]
child.h = ((child.position[0] - end_tile.position[0]) ** 2) + ( child.h = np.absolute(child.position[0] - end_tile.position[0]) + np.absolute(child.position[1] - end_tile.position[1])
(child.position[1] - end_tile.position[1]) ** 2)
child.f = child.g + child.h child.f = child.g + child.h
for open_node in open_list: for open_node in open_list:
if child == open_node and child.g > open_node.g: if child == open_node and child.g > open_node.g:
continue continue
open_list.append(child) open_list.append(child)
map = Map() map = Map()
waiter = Waiter([32, 32]) waiter = Waiter([32, 32])
tables = [] tables = []