From 5cb4d557e95599123af988de228d4daed38735fc Mon Sep 17 00:00:00 2001
From: "niehues.mark@gmail.com" <niehues.mark@gmail.com>
Date: Thu, 7 May 2020 18:07:21 +0200
Subject: [PATCH] do cleanup
---
evrouting/charge/routing.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/evrouting/charge/routing.py b/evrouting/charge/routing.py
index 7575258..9549ab0 100644
--- a/evrouting/charge/routing.py
+++ b/evrouting/charge/routing.py
@@ -68,9 +68,7 @@ def shortest_path(G: nx.DiGraph, charging_stations: Set[Node], s: Node, t: Node,
l_set[node_min].append(label_node_min)
if node_min == t:
- G.remove_node(t)
- charging_stations.remove(dummy_cs)
-
+ _cleanup(G, t, charging_stations, dummy_cs)
return _result(
label_node_min, f_soc_factory(label_node_min).minimum
)
@@ -138,9 +136,14 @@ def shortest_path(G: nx.DiGraph, charging_stations: Set[Node], s: Node, t: Node,
if is_new_min:
prio_queue.insert(n, **keys(f_soc_factory(label_neighbour)))
+ _cleanup(G, t, charging_stations, dummy_cs)
+ return EmptyResult()
+
+
+def _cleanup(G, t, charging_stations, dummy_cs):
G.remove_node(t)
+ G.remove_node(dummy_cs)
charging_stations.remove(dummy_cs)
- return EmptyResult()
def _setup(G: nx.Graph, charging_stations: Set[Node], capacity: SoC,
--
GitLab