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

drobna poprawa A*

Browse Source
This commit is contained in:
Łukasz Kinder 2022-04-28 21:34:54 +02:00
parent 421b42d578
commit efa0e7ddfc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tiles.py
View File

@ -308,7 +308,7 @@ def astar(map, start, end):
current_tile = open_list[0] current_tile = open_list[0]
current_index = 0 current_index = 0
for index, item in enumerate(open_list): for index, item in enumerate(open_list):
if item.f < current_tile.f: if item.f <= current_tile.f:
current_tile = item current_tile = item
current_index = index current_index = index
@ -336,7 +336,7 @@ def astar(map, start, end):
if child == closed_child: if child == closed_child:
skip = True skip = True
if skip is False: if skip is False:
child.g = map[child.position[0]][child.position[1]] child.g = current_tile.g + map[child.position[0]][child.position[1]]
child.h = np.absolute(child.position[0] - end_tile.position[0]) + np.absolute(child.position[1] - end_tile.position[1]) child.h = np.absolute(child.position[0] - end_tile.position[0]) + np.absolute(child.position[1] - end_tile.position[1])
child.f = child.g + child.h child.f = child.g + child.h
for open_node in open_list: for open_node in open_list:
@ -344,6 +344,7 @@ def astar(map, start, end):
continue continue
open_list.append(child) open_list.append(child)
map = Map() map = Map()
waiter = Waiter([32, 32]) waiter = Waiter([32, 32])
tables = [] tables = []