reorg

evrouting/graph_tools.py

+from collections import namedtuple
+
+Street = namedtuple('Street', ['u', 'v', 'distance', 'consumption'])
+Node = namedtuple('Node', ['label', 'charging_coeff'], defaults=(None, None))
+
+
+def node_convert(n: Node) -> dict:
+    return {'label': n.label, 'c': n.charging_coeff}
+
+
+def street_convert(s: Street) -> dict:
+    return {'weight': s.distance, 'c': s.consumption}

tests/config.py

-from collections import namedtuple
-
 import networkx as nx
 
-Street = namedtuple('Street', ['u', 'v', 'distance', 'consumption'])
-Node = namedtuple('Node', ['label', 'charging_coeff'], defaults=(None, None))
+from evrouting.graph_tools import Node, Street, node_convert, street_convert
 
 # List of configs
 config_list = ['edge_case']
@@ -31,9 +28,9 @@ def get_graph(config):
     G = nx.Graph()
 
     for node_id, node in enumerate(config['nodes']):
-        G.add_node(node_id, label=node.label, c=node.charging_coeff)
+        G.add_node(node_id, **node_convert(node))
 
     for edge in config['edges']:
-        G.add_edge(edge.u, edge.v, weight=edge.distance, c=edge.consumption)
+        G.add_edge(edge.u, edge.v, **street_convert(edge))
 
     return G