dijkstra: fix invalid stats
This commit is contained in:
10
dijsktra.py
10
dijsktra.py
@@ -52,17 +52,13 @@ class Dijkstra():
|
|||||||
# start at destination
|
# start at destination
|
||||||
sequence.append(dest)
|
sequence.append(dest)
|
||||||
|
|
||||||
total_time = 0
|
# go through all possibilities until we're back at start
|
||||||
total_co2 = 0
|
|
||||||
|
|
||||||
while start not in sequence:
|
while start not in sequence:
|
||||||
current = self.table[sequence[-1]] # last element of list
|
current = self.table[sequence[-1]] # last element of list
|
||||||
prev = current["prev"]
|
prev = current["prev"]
|
||||||
total_time += current["distance"][0]
|
|
||||||
total_co2 += current["distance"][1]
|
|
||||||
sequence.append(prev)
|
sequence.append(prev)
|
||||||
|
|
||||||
sequence.reverse()
|
sequence.reverse()
|
||||||
print(sequence)
|
print(sequence)
|
||||||
print("Total Time:", total_time)
|
print("Total Time:", self.table[dest]["distance"][0])
|
||||||
print("Total CO2:", total_co2)
|
print("Total CO2:", self.table[dest]["distance"][1])
|
||||||
|
|||||||
2
main.py
2
main.py
@@ -18,7 +18,7 @@ def main():
|
|||||||
graph: dict = create_graph(dataset)
|
graph: dict = create_graph(dataset)
|
||||||
# solve
|
# solve
|
||||||
dijkstra = Dijkstra(graph, dataset.connection)
|
dijkstra = Dijkstra(graph, dataset.connection)
|
||||||
dijkstra.algorithm("time")
|
dijkstra.algorithm("co2")
|
||||||
dijkstra.print_result(dataset.connection)
|
dijkstra.print_result(dataset.connection)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user