From 03281d4ce0df3432c2ab2314f64476b6b1a367db Mon Sep 17 00:00:00 2001
From: "niehues.mark@gmail.com" <niehues.mark@gmail.com>
Date: Thu, 26 Mar 2020 12:05:39 +0100
Subject: [PATCH] using other alg
---
evrouting/gasstation/routing.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/evrouting/gasstation/routing.py b/evrouting/gasstation/routing.py
index b9462fc..c31ff3c 100644
--- a/evrouting/gasstation/routing.py
+++ b/evrouting/gasstation/routing.py
@@ -1,5 +1,4 @@
from typing import Set, Union, Callable, List
-
import networkx as nx
from evrouting.T import Node, SoC
@@ -21,10 +20,12 @@ def shortest_path(G: nx.Graph, s, t, b_0: float, b_t: float, U: float):
pass
-def dijkstra(G: nx.Graph, u: Node, v: Node, weight: str = 'weight') -> Union[int, float]:
- path: List[Node] = nx.algorithms.shortest_path(G, u, v, weight=weight)
-
- return sum([G.edges[path[i], path[i + 1]][weight] for i in range(len(path) - 1)])
+def dijkstra(G: nx.Graph, u: Node, v: Node,
+ weight: str = 'weight') -> Union[int, float]:
+ length, _ = nx.algorithms.shortest_paths.single_source_dijkstra(
+ G, u, v, weight=weight
+ )
+ return length
def contract_graph(G: nx.Graph, S: Set[Node], U: SoC,
--
GitLab