merged semi-final
This commit is contained in:
commit
230b63d87b
8
astar.py
8
astar.py
@ -42,12 +42,12 @@ def astar(obiekty, start, cel):
|
||||
continue
|
||||
elif 6 <= sasiad[0] <= 7 and 10 <= sasiad[1] <= 11:
|
||||
continue
|
||||
tentative_g_score = gscore[current] + \
|
||||
heurystyka(obiekty, current, sasiad)
|
||||
tentative_h_score = heurystyka(
|
||||
obiekty, sasiad, cel) + heurystyka(obiekty, current, sasiad)
|
||||
|
||||
if sasiad in close_set and tentative_g_score >= gscore.get(sasiad, 0):
|
||||
if sasiad in [i[1] for i in oheap] and tentative_h_score < hscore.get(current, 0):
|
||||
continue
|
||||
if sasiad not in close_set and sasiad not in [i[1] for i in oheap]:
|
||||
elif sasiad not in close_set and sasiad not in [i[1] for i in oheap]:
|
||||
came_from[sasiad] = current
|
||||
hscore[sasiad] = tentative_h_score
|
||||
fscore[sasiad] = tentative_h_score + gscore[current]
|
||||
|
Loading…
Reference in New Issue
Block a user