mirror of
https://github.com/kuhyx/WUT_Computer_Science.git
synced 2026-11-20 10:52:25 +01:00
chore: change heuristic to euclidean, make random heuristic work
This commit is contained in:
parent
155c718df6
commit
cf9f4f108f
6
main.py
6
main.py
@ -100,7 +100,7 @@ class MazeSolver:
|
|||||||
for neighbor in self.get_neighbors(current):
|
for neighbor in self.get_neighbors(current):
|
||||||
if neighbor not in visited:
|
if neighbor not in visited:
|
||||||
new_path = path + [neighbor]
|
new_path = path + [neighbor]
|
||||||
heuristic, heuristic_time = self.heuristic_manhattan(neighbor)
|
heuristic, heuristic_time = self.heuristic_euclidean(neighbor)
|
||||||
heuristic_total_time += heuristic_time
|
heuristic_total_time += heuristic_time
|
||||||
heuristics_called += 1
|
heuristics_called += 1
|
||||||
heapq.heappush(
|
heapq.heappush(
|
||||||
@ -120,7 +120,7 @@ class MazeSolver:
|
|||||||
# push onto the queue (which becomes heapq), element containing values
|
# push onto the queue (which becomes heapq), element containing values
|
||||||
# we use heapq so the element with lowest heuristic value will always
|
# we use heapq so the element with lowest heuristic value will always
|
||||||
# be at the top of heap
|
# be at the top of heap
|
||||||
heuristic = self.heuristic_manhattan(self.start)
|
heuristic = self.heuristic_euclidean(self.start)
|
||||||
heapq.heappush(
|
heapq.heappush(
|
||||||
queue, (heuristic, self.start, [self.start])
|
queue, (heuristic, self.start, [self.start])
|
||||||
)
|
)
|
||||||
@ -155,7 +155,7 @@ class MazeSolver:
|
|||||||
heuristic_time = end_time - start_time
|
heuristic_time = end_time - start_time
|
||||||
return heuristic, heuristic_time
|
return heuristic, heuristic_time
|
||||||
|
|
||||||
def heuristic_random(self):
|
def heuristic_random(self, position):
|
||||||
"""Heuristic function that just returns random value between 0 and 1"""
|
"""Heuristic function that just returns random value between 0 and 1"""
|
||||||
start_time = time.perf_counter()
|
start_time = time.perf_counter()
|
||||||
heuristic = random()
|
heuristic = random()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user