From 7a1758d00aec1199ed8fc780b106c01ef904d89f Mon Sep 17 00:00:00 2001
From: "niehues.mark@gmail.com" <niehues.mark@gmail.com>
Date: Wed, 18 Mar 2020 14:17:52 +0100
Subject: [PATCH] little refactor
---
evrouting/charge/routing.py | 8 ++++----
evrouting/utils.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/evrouting/charge/routing.py b/evrouting/charge/routing.py
index 513f1cb..28eda64 100644
--- a/evrouting/charge/routing.py
+++ b/evrouting/charge/routing.py
@@ -4,7 +4,7 @@ from math import inf
import networkx as nx
from evrouting.T import Node, SoC, Time
from evrouting.utils import PriorityQueue
-from evrouting.charge import factories as factories
+from evrouting.charge.factories import soc_profile as soc_profile_factory
from ..graph_tools import distance
from .T import SoCFunction, Label
@@ -42,7 +42,7 @@ def shortest_path(G: nx.Graph, charging_stations: set, s: Node, t: Node,
t_trip=0,
soc_last_cs=initial_soc,
last_cs=dummy_node,
- soc_profile_cs_v=factories.soc_profile(G, capacity, s)
+ soc_profile_cs_v=soc_profile_factory(G, capacity, s)
)
l_uns[s].insert(
@@ -87,7 +87,7 @@ def shortest_path(G: nx.Graph, charging_stations: set, s: Node, t: Node,
t_trip=t_trip_old + t_charge,
soc_last_cs=old_soc_function(t_trip_old + t_charge),
last_cs=minimum_node,
- soc_profile_cs_v=factories.soc_profile(
+ soc_profile_cs_v=soc_profile_factory(
G, capacity, minimum_node
)
)
@@ -109,7 +109,7 @@ def shortest_path(G: nx.Graph, charging_stations: set, s: Node, t: Node,
for n in G.neighbors(minimum_node):
# Create SoC Profile for getting from minimum_node to n
soc_profile = label_minimum_node.soc_profile_cs_v + \
- factories.soc_profile(G, capacity, minimum_node, n)
+ soc_profile_factory(G, capacity, minimum_node, n)
if not soc_profile(capacity) == -inf:
# It is possible to get from minimum_node to n
l_new = Label(
diff --git a/evrouting/utils.py b/evrouting/utils.py
index 1bd77e1..99a190c 100644
--- a/evrouting/utils.py
+++ b/evrouting/utils.py
@@ -1,6 +1,6 @@
import itertools
from typing import Any
-from heapq import *
+from heapq import heappush, heappop
class PriorityQueue:
--
GitLab