diff --git a/evaluation/configs/bigger_gasstation.yaml b/evaluation/configs/bigger_gasstation.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2f588a5899e11eb16d7456a13a069c58a9bfa7c4
--- /dev/null
+++ b/evaluation/configs/bigger_gasstation.yaml
@@ -0,0 +1,37 @@
+description: >
+ Compare charge and gasstation problem by assuming for the charge
+ algorithm also an consumption proportional to driving time.
+type: query
+charging_stations: charging_stations.json
+maps:
+ - oberpfalz-latest.osm
+queries_per_setup: 10
+setups:
+ - mu_s: 300 # Start and Target Soc
+ mu_t: 0
+ charging_stations: 1 # Max Number of charging Stations to be inserted.
+ capacity: 300 # kWh
+ consumption:
+ type: gasstation
+ consumption_coefficient: 0.1 # kWh/s
+ - mu_s: 300 # Start and Target Soc
+ mu_t: 0
+ charging_stations: 2 # Max Number of charging Stations to be inserted.
+ capacity: 300 # kWh
+ consumption:
+ type: gasstation
+ consumption_coefficient: 0.1 # kWh/s
+ - mu_s: 300 # Start and Target Soc
+ mu_t: 0
+ charging_stations: 4 # Max Number of charging Stations to be inserted.
+ capacity: 300 # kWh
+ consumption:
+ type: gasstation
+ consumption_coefficient: 0.1 # kWh/s
+ - mu_s: 300 # Start and Target Soc
+ mu_t: 0
+ charging_stations: 8 # Max Number of charging Stations to be inserted.
+ capacity: 300 # kWh
+ consumption:
+ type: gasstation
+ consumption_coefficient: 0.1 # kWh/s
diff --git a/evaluation/lib/T.py b/evaluation/lib/T.py
index a3fb361f247ec247e0f3b8bb196546a19dfec8e2..b5b819e70e40cfc1f88cf4cf43ef4893df146e7c 100644
--- a/evaluation/lib/T.py
+++ b/evaluation/lib/T.py
@@ -22,15 +22,24 @@ class QueryRow:
@dataclass
-class GasstationQueryRow(QueryRow):
+class ChargingStopsQuery(QueryRow):
+ charging_stops: int
+ charging_time: float
+
+
+@dataclass
+class GasstationQueryRow(ChargingStopsQuery):
time_contracted_graph: float
time_state_graph: float
+ nodes_state_graph: int
+ edges_state_graph: int
@dataclass
-class ChargeQueryRow(QueryRow):
+class ChargeQueryRow(ChargingStopsQuery):
pass
+
@dataclass
class ClassicQueryRow(QueryRow):
dijkstra_rank: int
diff --git a/evaluation/lib/queries.py b/evaluation/lib/queries.py
index 70bffc05cbd05a3d95803515d7bfcdcc20ece62f..99c40dd91216a338f88ac5b2cd4f5e8d4aa68bdf 100644
--- a/evaluation/lib/queries.py
+++ b/evaluation/lib/queries.py
@@ -7,6 +7,7 @@ from evrouting.T import Result
from evrouting import gasstation, charge
from evrouting.graph_tools import (
consumption_function_distance_factory,
+ consumption_function_time_factory,
DISTANCE_KEY
)
from evrouting.osm.profiles import car
@@ -99,21 +100,30 @@ def gasstation_query(graph, conf, s, t):
)
query_time = perf_counter() - start
+ charge_stops = [t for n, t in result.charge_path if t > 0]
return GasstationQueryRow(
start_node=s,
target_node=t,
query_time=query_time,
- trip_time=result.trip_time if type(result) == Result else None,
+ trip_time=result.trip_time,
nodes=len(graph.nodes),
edges=len(graph.edges),
charging_stations=len(graph.charging_stations),
time_contracted_graph=contraction_time,
- time_state_graph=state_graph_time
+ time_state_graph=state_graph_time,
+ charging_stops=len(charge_stops),
+ charging_time=sum(charge_stops),
+ nodes_state_graph=len(state_graph.nodes),
+ edges_state_graph=len(state_graph.edges)
)
def charge_query(graph, conf, s, t):
start = perf_counter()
+ if conf['consumption']['type'] == 'gasstation':
+ c = consumption_function_time_factory(conf['consumption']['consumption_coefficient'])
+ else:
+ c = consumption_function_distance_factory(conf['consumption']['consumption_coefficient'])
result = charge.shortest_path(
G=graph,
charging_stations=graph.charging_stations,
@@ -122,18 +132,20 @@ def charge_query(graph, conf, s, t):
initial_soc=conf['mu_s'],
final_soc=conf['mu_t'],
capacity=conf['capacity'],
- c=consumption_function_distance_factory(conf['consumption']['consumption_coefficient'])
+ c=c
)
runtime = perf_counter() - start
-
+ charge_stops = [t for n, t in result.charge_path if t > 0]
return ChargeQueryRow(
start_node=s,
target_node=t,
query_time=runtime,
- trip_time=result.trip_time if type(result) == Result else None,
+ trip_time=result.trip_time,
nodes=len(graph.nodes),
edges=len(graph.edges),
- charging_stations=len(graph.charging_stations)
+ charging_stations=len(graph.charging_stations),
+ charging_stops=len(charge_stops),
+ charging_time=sum(charge_stops)
)
diff --git a/evaluation/results/bigger_gasstation/queries/astar.csv b/evaluation/results/bigger_gasstation/queries/astar.csv
new file mode 100644
index 0000000000000000000000000000000000000000..c167c4cf1ce44921ec3f394194780894e6e85e4f
--- /dev/null
+++ b/evaluation/results/bigger_gasstation/queries/astar.csv
@@ -0,0 +1,41 @@
+start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
+1385785800,33772082,0.4435737189996871,3116.9420700729297,726483,1483098,1
+271278460,2053482908,0.7572415720023855,2967.303293502786,726483,1483098,1
+323234723,318650810,1.938004538998939,9294.806406909256,726483,1483098,1
+3288475788,305697023,0.1009388670026965,1444.4324093488428,726483,1483098,1
+4165364598,327549117,1.3069191739996313,3661.6419665058606,726483,1483098,1
+2057450430,2017910300,2.1429706889975932,3091.171051235674,726483,1483098,1
+1317120922,304047740,1.4852247920025548,3825.28850311766,726483,1483098,1
+2861598561,319313714,0.7724161359983555,2014.5745756257288,726483,1483098,1
+5079723525,3898833070,3.3261722969982657,6113.672236028786,726483,1483098,1
+318650943,3556528073,0.7991598910011817,2294.308787298349,726483,1483098,1
+1385785800,33772082,0.4287553089998255,3116.9420700729297,726483,1483098,2
+271278460,2053482908,0.7525196530004905,2967.303293502786,726483,1483098,2
+323234723,318650810,1.9200327520011342,9294.806406909256,726483,1483098,2
+3288475788,305697023,0.09974611900179298,1444.4324093488428,726483,1483098,2
+4165364598,327549117,1.30833994799832,3661.6419665058606,726483,1483098,2
+2057450430,2017910300,2.133417715998803,3091.171051235674,726483,1483098,2
+1317120922,304047740,1.486686837997695,3825.28850311766,726483,1483098,2
+2861598561,319313714,0.7630472060009197,2014.5745756257288,726483,1483098,2
+5079723525,3898833070,3.3014489380002487,6113.672236028786,726483,1483098,2
+318650943,3556528073,0.8017099040007452,2294.308787298349,726483,1483098,2
+1385785800,33772082,0.4316894229996251,3116.9420700729297,726483,1483098,4
+271278460,2053482908,0.7558269300025131,2967.303293502786,726483,1483098,4
+323234723,318650810,1.9256996549993346,9294.806406909256,726483,1483098,4
+3288475788,305697023,0.1015692590008257,1444.4324093488428,726483,1483098,4
+4165364598,327549117,1.299609572000918,3661.6419665058606,726483,1483098,4
+2057450430,2017910300,2.1343681430007564,3091.171051235674,726483,1483098,4
+1317120922,304047740,1.4935703390001436,3825.28850311766,726483,1483098,4
+2861598561,319313714,0.7595806760000414,2014.5745756257288,726483,1483098,4
+5079723525,3898833070,3.3113953350002703,6113.672236028786,726483,1483098,4
+318650943,3556528073,0.8058240339996701,2294.308787298349,726483,1483098,4
+1385785800,33772082,0.42734998900050414,3116.9420700729297,726483,1483098,8
+271278460,2053482908,0.7492127740006254,2967.303293502786,726483,1483098,8
+323234723,318650810,1.9120280870010902,9294.806406909256,726483,1483098,8
+3288475788,305697023,0.09923979599989252,1444.4324093488428,726483,1483098,8
+4165364598,327549117,1.2969463049994374,3661.6419665058606,726483,1483098,8
+2057450430,2017910300,2.114154573999258,3091.171051235674,726483,1483098,8
+1317120922,304047740,1.476350826000271,3825.28850311766,726483,1483098,8
+2861598561,319313714,0.7571664719980618,2014.5745756257288,726483,1483098,8
+5079723525,3898833070,3.2748775420004677,6113.672236028786,726483,1483098,8
+318650943,3556528073,0.8032790580000437,2294.308787298349,726483,1483098,8
diff --git a/evaluation/results/bigger_gasstation/queries/charge.csv b/evaluation/results/bigger_gasstation/queries/charge.csv
new file mode 100644
index 0000000000000000000000000000000000000000..1d0a84cb83a2a28ae78b60904fb308fca58aa8e2
--- /dev/null
+++ b/evaluation/results/bigger_gasstation/queries/charge.csv
@@ -0,0 +1,41 @@
+start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
+1385785800,33772082,4.701348691000021,None,726484,1483098,1
+271278460,2053482908,3.763555412002461,None,726483,1483098,1
+323234723,318650810,4.209436783003184,None,726484,1483098,1
+3288475788,305697023,3.912974081002176,None,726483,1483098,1
+4165364598,327549117,3.7522980290013948,None,726484,1483098,1
+2057450430,2017910300,4.0652056069993705,None,726483,1483098,1
+1317120922,304047740,4.12019238799985,None,726484,1483098,1
+2861598561,319313714,4.945775017000415,None,726483,1483098,1
+5079723525,3898833070,4.514038929999515,None,726484,1483098,1
+318650943,3556528073,3.5914706319999823,None,726483,1483098,1
+1385785800,33772082,4.7001582519988006,None,726484,1483098,2
+271278460,2053482908,3.816516632999992,None,726483,1483098,2
+323234723,318650810,3.700297874998796,None,726484,1483098,2
+3288475788,305697023,4.220044230001804,None,726483,1483098,2
+4165364598,327549117,4.1670810940013325,None,726484,1483098,2
+2057450430,2017910300,4.124165040997468,None,726483,1483098,2
+1317120922,304047740,4.236663059000421,None,726484,1483098,2
+2861598561,319313714,4.623573625998688,None,726483,1483098,2
+5079723525,3898833070,4.01195514599749,None,726484,1483098,2
+318650943,3556528073,3.8746591650015034,None,726483,1483098,2
+1385785800,33772082,4.599323835998803,None,726484,1483098,4
+271278460,2053482908,3.730802912999934,None,726483,1483098,4
+323234723,318650810,3.5965108959971985,None,726484,1483098,4
+3288475788,305697023,4.630748290997872,None,726483,1483098,4
+4165364598,327549117,3.7740974449989153,None,726484,1483098,4
+2057450430,2017910300,3.582444250001572,None,726483,1483098,4
+1317120922,304047740,4.535677701001987,None,726484,1483098,4
+2861598561,319313714,4.550896796998131,None,726483,1483098,4
+5079723525,3898833070,3.933685134998086,None,726484,1483098,4
+318650943,3556528073,4.305259052998736,None,726483,1483098,4
+1385785800,33772082,3.691162908999104,None,726484,1483098,8
+271278460,2053482908,4.522895796999364,None,726483,1483098,8
+323234723,318650810,3.729634403000091,None,726484,1483098,8
+3288475788,305697023,3.787622730000294,None,726483,1483098,8
+4165364598,327549117,4.119184036997467,None,726484,1483098,8
+2057450430,2017910300,4.112757492999663,None,726483,1483098,8
+1317120922,304047740,3.7167960570004652,None,726484,1483098,8
+2861598561,319313714,4.980639378998603,None,726483,1483098,8
+5079723525,3898833070,4.052854027999274,None,726484,1483098,8
+318650943,3556528073,3.442107214999851,None,726483,1483098,8
diff --git a/evaluation/results/bigger_gasstation/queries/classic.csv b/evaluation/results/bigger_gasstation/queries/classic.csv
new file mode 100644
index 0000000000000000000000000000000000000000..58fab3cb7a495669f72f5414abf3de0dc79bd390
--- /dev/null
+++ b/evaluation/results/bigger_gasstation/queries/classic.csv
@@ -0,0 +1,41 @@
+start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,dijkstra_rank
+1385785800,33772082,0.7950426880015584,3116.9420700729297,726483,1483098,1,239150
+271278460,2053482908,0.5425881400005892,2967.303293502786,726483,1483098,1,172604
+323234723,318650810,1.123060940997675,9294.806406909256,726483,1483098,1,348464
+3288475788,305697023,0.04362870099794236,1444.4324093488428,726483,1483098,1,16372
+4165364598,327549117,1.3468901209998876,3661.6419665058606,726483,1483098,1,394166
+2057450430,2017910300,1.5957961849999265,3091.171051235674,726483,1483098,1,447365
+1317120922,304047740,1.0556234910000057,3825.28850311766,726483,1483098,1,313654
+2861598561,319313714,0.6300095219994546,2014.5745756257288,726483,1483098,1,188298
+5079723525,3898833070,1.8510064239999338,6113.672236028786,726483,1483098,1,548568
+318650943,3556528073,0.729972313001781,2294.308787298349,726483,1483098,1,218069
+1385785800,33772082,0.8375609569993685,3116.9420700729297,726483,1483098,2,239150
+271278460,2053482908,0.5736865819999366,2967.303293502786,726483,1483098,2,172604
+323234723,318650810,1.1814487679985177,9294.806406909256,726483,1483098,2,348464
+3288475788,305697023,0.0432080880018475,1444.4324093488428,726483,1483098,2,16372
+4165364598,327549117,1.4051549089999753,3661.6419665058606,726483,1483098,2,394166
+2057450430,2017910300,1.6573288280014822,3091.171051235674,726483,1483098,2,447365
+1317120922,304047740,1.092741410000599,3825.28850311766,726483,1483098,2,313654
+2861598561,319313714,0.6544182780016854,2014.5745756257288,726483,1483098,2,188298
+5079723525,3898833070,1.9380712760030292,6113.672236028786,726483,1483098,2,548568
+318650943,3556528073,0.7587861239990161,2294.308787298349,726483,1483098,2,218069
+1385785800,33772082,0.7901141069996811,3116.9420700729297,726483,1483098,4,239150
+271278460,2053482908,0.5456742749993282,2967.303293502786,726483,1483098,4,172604
+323234723,318650810,1.1328986490007082,9294.806406909256,726483,1483098,4,348464
+3288475788,305697023,0.04337616100019659,1444.4324093488428,726483,1483098,4,16372
+4165364598,327549117,1.3513961450007628,3661.6419665058606,726483,1483098,4,394166
+2057450430,2017910300,1.5939954550012772,3091.171051235674,726483,1483098,4,447365
+1317120922,304047740,1.0547424659998796,3825.28850311766,726483,1483098,4,313654
+2861598561,319313714,0.6343335019992082,2014.5745756257288,726483,1483098,4,188298
+5079723525,3898833070,1.8595685020009114,6113.672236028786,726483,1483098,4,548568
+318650943,3556528073,0.7317967899980431,2294.308787298349,726483,1483098,4,218069
+1385785800,33772082,0.7738518730002397,3116.9420700729297,726483,1483098,8,239150
+271278460,2053482908,0.5379042880013003,2967.303293502786,726483,1483098,8,172604
+323234723,318650810,1.1136094800021965,9294.806406909256,726483,1483098,8,348464
+3288475788,305697023,0.0430277039995417,1444.4324093488428,726483,1483098,8,16372
+4165364598,327549117,1.3291890260006767,3661.6419665058606,726483,1483098,8,394166
+2057450430,2017910300,1.6173935860024358,3091.171051235674,726483,1483098,8,447365
+1317120922,304047740,1.037306971000362,3825.28850311766,726483,1483098,8,313654
+2861598561,319313714,0.6189728680001281,2014.5745756257288,726483,1483098,8,188298
+5079723525,3898833070,1.8340499590012769,6113.672236028786,726483,1483098,8,548568
+318650943,3556528073,0.7184215540000878,2294.308787298349,726483,1483098,8,218069
diff --git a/evaluation/results/bigger_gasstation/queries/gasstation.csv b/evaluation/results/bigger_gasstation/queries/gasstation.csv
new file mode 100644
index 0000000000000000000000000000000000000000..2de9fd23d38eb9e9cafb2eb403cf591e158694d6
--- /dev/null
+++ b/evaluation/results/bigger_gasstation/queries/gasstation.csv
@@ -0,0 +1,41 @@
+start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,time_contracted_graph,time_state_graph
+1385785800,33772082,8.747158182999556,None,726483,1483098,1,0.00012285100092412904,2.339799902983941e-05
+271278460,2053482908,0.7598281850005151,2967.303293502786,726483,1483098,1,0.00012285100092412904,2.339799902983941e-05
+323234723,318650810,6.549136538000312,None,726483,1483098,1,0.00012285100092412904,2.339799902983941e-05
+3288475788,305697023,0.10238950599887175,1444.4324093488428,726483,1483098,1,0.00012285100092412904,2.339799902983941e-05
+4165364598,327549117,11.021174552999582,None,726483,1483098,1,0.00012285100092412904,2.339799902983941e-05
+2057450430,2017910300,12.633808378002868,None,726483,1483098,1,0.00012285100092412904,2.339799902983941e-05
+1317120922,304047740,4.862797188998229,None,726483,1483098,1,0.00012285100092412904,2.339799902983941e-05
+2861598561,319313714,0.7776994919986464,2014.5745756257288,726483,1483098,1,0.00012285100092412904,2.339799902983941e-05
+5079723525,3898833070,9.63669599199784,None,726483,1483098,1,0.00012285100092412904,2.339799902983941e-05
+318650943,3556528073,0.8148567520001961,2294.308787298349,726483,1483098,1,0.00012285100092412904,2.339799902983941e-05
+1385785800,33772082,3.2038910720002605,16911.316015045435,726483,1483098,2,0.5626262980003958,7.302599988179281e-05
+271278460,2053482908,0.7588134289981099,2967.303293502786,726483,1483098,2,0.5626262980003958,7.302599988179281e-05
+323234723,318650810,6.926233482998214,None,726483,1483098,2,0.5626262980003958,7.302599988179281e-05
+3288475788,305697023,0.10007987199787749,1444.4324093488428,726483,1483098,2,0.5626262980003958,7.302599988179281e-05
+4165364598,327549117,5.262335620998783,46663.08853633015,726483,1483098,2,0.5626262980003958,7.302599988179281e-05
+2057450430,2017910300,5.8914172500008135,16545.321157931437,726483,1483098,2,0.5626262980003958,7.302599988179281e-05
+1317120922,304047740,5.86171483599901,None,726483,1483098,2,0.5626262980003958,7.302599988179281e-05
+2861598561,319313714,0.7684696199976315,2014.5745756257288,726483,1483098,2,0.5626262980003958,7.302599988179281e-05
+5079723525,3898833070,8.555743979999534,None,726483,1483098,2,0.5626262980003958,7.302599988179281e-05
+318650943,3556528073,0.8053740359973744,2294.308787298349,726483,1483098,2,0.5626262980003958,7.302599988179281e-05
+1385785800,33772082,12.960288793998188,15773.981538856722,726483,1483098,4,9.520688128999609,0.00014653900143457577
+271278460,2053482908,0.7656611159982276,2967.303293502786,726483,1483098,4,9.520688128999609,0.00014653900143457577
+323234723,318650810,22.39494036099859,None,726483,1483098,4,9.520688128999609,0.00014653900143457577
+3288475788,305697023,0.10060176799743203,1444.4324093488428,726483,1483098,4,9.520688128999609,0.00014653900143457577
+4165364598,327549117,19.384134478001215,41320.32824532289,726483,1483098,4,9.520688128999609,0.00014653900143457577
+2057450430,2017910300,14.334690890002094,5717.984200615112,726483,1483098,4,9.520688128999609,0.00014653900143457577
+1317120922,304047740,19.314051128996653,38542.035245256055,726483,1483098,4,9.520688128999609,0.00014653900143457577
+2861598561,319313714,0.7676711200001591,2014.5745756257288,726483,1483098,4,9.520688128999609,0.00014653900143457577
+5079723525,3898833070,19.196355962998496,None,726483,1483098,4,9.520688128999609,0.00014653900143457577
+318650943,3556528073,0.8014577499998268,2294.308787298349,726483,1483098,4,9.520688128999609,0.00014653900143457577
+1385785800,33772082,17.542155767001532,11905.586928345323,726483,1483098,8,34.86218224900222,0.0008057499981077854
+271278460,2053482908,0.7465481369981717,2967.303293502786,726483,1483098,8,34.86218224900222,0.0008057499981077854
+323234723,318650810,34.55516797399832,None,726483,1483098,8,34.86218224900222,0.0008057499981077854
+3288475788,305697023,0.10000166199824889,1444.4324093488428,726483,1483098,8,34.86218224900222,0.0008057499981077854
+4165364598,327549117,24.594633175001945,21541.681386057164,726483,1483098,8,34.86218224900222,0.0008057499981077854
+2057450430,2017910300,21.671941919998062,18278.555197440994,726483,1483098,8,34.86218224900222,0.0008057499981077854
+1317120922,304047740,30.595260213001893,54818.836219881356,726483,1483098,8,34.86218224900222,0.0008057499981077854
+2861598561,319313714,0.7713705989990558,2014.5745756257288,726483,1483098,8,34.86218224900222,0.0008057499981077854
+5079723525,3898833070,29.971048800998688,None,726483,1483098,8,34.86218224900222,0.0008057499981077854
+318650943,3556528073,0.8080959160033672,2294.308787298349,726483,1483098,8,34.86218224900222,0.0008057499981077854
diff --git a/evaluation/results/example/queries/astar.csv b/evaluation/results/example/queries/astar.csv
index dad762a562e1e2c414326efeff45c38508e4be42..8e5b15a5fbedd82a29dccdfac28c19c781203e00 100644
--- a/evaluation/results/example/queries/astar.csv
+++ b/evaluation/results/example/queries/astar.csv
@@ -1,31 +1,31 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
-318014972,7257113601,0.009645116999308812,303.9029199340039,2827,5691,1
-4016874254,469733540,0.006284021001192741,203.4574395036612,2827,5691,1
-34053447,7140363804,0.00964908599962655,325.54326871206933,2827,5691,1
-7030609384,474997016,0.00958121000076062,354.32678807490765,2827,5691,1
-321209228,503294825,0.0187146100015525,531.9688537252507,2827,5691,1
-6001596194,34053443,0.0006074889988667564,None,2827,5691,1
-1778028226,2591134812,0.020385181000165176,730.261875045356,2827,5691,1
-408478761,574727021,0.009288154000387294,565.2289730244942,2827,5691,1
-2379050788,3307706689,0.01078263099952892,384.0706971765939,2827,5691,1
-2635713649,1937172847,0.024944430999312317,686.100743161775,2827,5691,1
-318014972,7257113601,0.009514129000308458,303.9029199340039,2827,5691,2
-4016874254,469733540,0.006327432000034605,203.4574395036612,2827,5691,2
-34053447,7140363804,0.009514243000012357,325.54326871206933,2827,5691,2
-7030609384,474997016,0.009525188999759848,354.32678807490765,2827,5691,2
-321209228,503294825,0.019946009999330272,531.9688537252507,2827,5691,2
-6001596194,34053443,0.000804137000159244,None,2827,5691,2
-1778028226,2591134812,0.0206813710010465,730.261875045356,2827,5691,2
-408478761,574727021,0.009176258001389215,565.2289730244942,2827,5691,2
-2379050788,3307706689,0.010665679999874556,384.0706971765939,2827,5691,2
-2635713649,1937172847,0.024859645000105957,686.100743161775,2827,5691,2
-318014972,7257113601,0.00947512499988079,303.9029199340039,2827,5691,3
-4016874254,469733540,0.006297292000454036,203.4574395036612,2827,5691,3
-34053447,7140363804,0.009648182000091765,325.54326871206933,2827,5691,3
-7030609384,474997016,0.009353209999972023,354.32678807490765,2827,5691,3
-321209228,503294825,0.018495610000172746,531.9688537252507,2827,5691,3
-6001596194,34053443,0.0006244750002224464,None,2827,5691,3
-1778028226,2591134812,0.02025007900010678,730.261875045356,2827,5691,3
-408478761,574727021,0.009084488001462887,565.2289730244942,2827,5691,3
-2379050788,3307706689,0.010748721000709338,384.0706971765939,2827,5691,3
-2635713649,1937172847,0.024342005999642424,686.100743161775,2827,5691,3
+7031883143,1718397716,0.0071867709993966855,316.64780752530135,2827,5691,1
+1937178503,1672267797,0.007920848998764995,872.2806195648016,2827,5691,1
+306639015,408478834,0.01589827099815011,733.7369613783485,2827,5691,1
+2616462188,2604992884,0.006387274999724468,278.6727003101405,2827,5691,1
+2604687802,7115183097,0.004705728999397252,293.97608319989524,2827,5691,1
+7321870107,1447654177,0.010741868001787225,381.1074473935305,2827,5691,1
+2360479287,317767226,0.004264895000233082,364.56976540113374,2827,5691,1
+1934188869,418009256,0.022862457000883296,894.0178162972176,2827,5691,1
+2623041440,938229662,0.0002099310004268773,78.88062349750348,2827,5691,1
+3273193624,317841013,0.0003196700017724652,112.2768119941219,2827,5691,1
+7031883143,1718397716,0.007785580000927439,316.64780752530135,2827,5691,2
+1937178503,1672267797,0.00866141400183551,872.2806195648016,2827,5691,2
+306639015,408478834,0.016911053000512766,733.7369613783485,2827,5691,2
+2616462188,2604992884,0.006497225997009082,278.6727003101405,2827,5691,2
+2604687802,7115183097,0.005207654998230282,293.97608319989524,2827,5691,2
+7321870107,1447654177,0.011237661001359811,381.1074473935305,2827,5691,2
+2360479287,317767226,0.004888520001259167,364.56976540113374,2827,5691,2
+1934188869,418009256,0.02440867900077137,894.0178162972176,2827,5691,2
+2623041440,938229662,0.00023110699839890003,78.88062349750348,2827,5691,2
+3273193624,317841013,0.00032691700107534416,112.2768119941219,2827,5691,2
+7031883143,1718397716,0.007788024999172194,316.64780752530135,2827,5691,3
+1937178503,1672267797,0.008001836999028455,872.2806195648016,2827,5691,3
+306639015,408478834,0.016025449000153458,733.7369613783485,2827,5691,3
+2616462188,2604992884,0.006399969999620225,278.6727003101405,2827,5691,3
+2604687802,7115183097,0.0046275670028990135,293.97608319989524,2827,5691,3
+7321870107,1447654177,0.010837180001544766,381.1074473935305,2827,5691,3
+2360479287,317767226,0.004294277998269536,364.56976540113374,2827,5691,3
+1934188869,418009256,0.023243578001711285,894.0178162972176,2827,5691,3
+2623041440,938229662,0.0002108310000039637,78.88062349750348,2827,5691,3
+3273193624,317841013,0.0003184380002494436,112.2768119941219,2827,5691,3
diff --git a/evaluation/results/example/queries/charge.csv b/evaluation/results/example/queries/charge.csv
index 7d9abe446826e6276a11a0e0667c78a5be64590d..79aea42463520262cd9d64a26573f65b57c62e1b 100644
--- a/evaluation/results/example/queries/charge.csv
+++ b/evaluation/results/example/queries/charge.csv
@@ -1,31 +1,31 @@
-start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
-318014972,7257113601,0.27655807900009677,303.9029199340039,2828,5691,1
-4016874254,469733540,0.1551367569991271,203.4574395036612,2827,5691,1
-34053447,7140363804,0.30442173200026446,None,2828,5691,1
-7030609384,474997016,1.1434802250005305,379.15309214907137,2827,5691,1
-321209228,503294825,0.25744412600033684,None,2828,5691,1
-6001596194,34053443,0.0061631549997400725,None,2827,5691,1
-1778028226,2591134812,0.09009641500051657,None,2828,5691,1
-408478761,574727021,0.04526400699978694,None,2827,5691,1
-2379050788,3307706689,0.2636258339989581,None,2828,5691,1
-2635713649,1937172847,0.2756225490011275,None,2827,5691,1
-318014972,7257113601,0.1915681249993213,303.9029199340039,2828,5691,2
-4016874254,469733540,0.1974113939995732,203.4574395036612,2827,5691,2
-34053447,7140363804,0.5998310439990746,22553.607852962876,2828,5691,2
-7030609384,474997016,1.6561665600002016,379.15309214907137,2827,5691,2
-321209228,503294825,0.1404855580003641,None,2828,5691,2
-6001596194,34053443,0.006048253000699333,None,2827,5691,2
-1778028226,2591134812,0.31593750000138243,None,2828,5691,2
-408478761,574727021,0.01954903200021363,None,2827,5691,2
-2379050788,3307706689,0.15553496400025324,None,2828,5691,2
-2635713649,1937172847,0.7300595910000993,None,2827,5691,2
-318014972,7257113601,0.2780105450001429,303.9029199340039,2828,5691,3
-4016874254,469733540,0.1953965070006234,203.4574395036612,2827,5691,3
-34053447,7140363804,0.5695106439998199,22553.607852962876,2828,5691,3
-7030609384,474997016,1.6730227469997772,379.15309214907137,2827,5691,3
-321209228,503294825,0.25396033600009105,None,2828,5691,3
-6001596194,34053443,0.032242059000054724,None,2827,5691,3
-1778028226,2591134812,0.3155581999999413,None,2828,5691,3
-408478761,574727021,0.01969658100097149,None,2827,5691,3
-2379050788,3307706689,0.2599113149990444,None,2828,5691,3
-2635713649,1937172847,0.7583798939995177,None,2827,5691,3
+start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,charging_stops,charging_time
+7031883143,1718397716,0.17617846699795336,316.64780752530135,2828,5691,1,0,0
+1937178503,1672267797,0.10277413600124419,872.2806195648016,2827,5691,1,0,0
+306639015,408478834,0.47943489399767714,733.7369613783485,2828,5691,1,0,0
+2616462188,2604992884,0.11399101500137476,278.6727003101405,2827,5691,1,0,0
+2604687802,7115183097,0.13441785200120648,293.97608319989524,2828,5691,1,0,0
+7321870107,1447654177,0.27800166299857665,381.1074473935305,2827,5691,1,0,0
+2360479287,317767226,0.08924905999811017,364.56976540113374,2828,5691,1,0,0
+1934188869,418009256,0.5746747160010273,894.0178162972176,2827,5691,1,0,0
+2623041440,938229662,0.040614147001178935,78.88062349750348,2828,5691,1,0,0
+3273193624,317841013,0.009622855999623425,112.2768119941219,2827,5691,1,0,0
+7031883143,1718397716,0.1631640019986662,316.64780752530135,2828,5691,2,0,0
+1937178503,1672267797,0.11307054900316871,872.2806195648016,2827,5691,2,0,0
+306639015,408478834,0.4942542829994636,733.7369613783485,2828,5691,2,0,0
+2616462188,2604992884,0.19560996099971817,278.6727003101405,2827,5691,2,0,0
+2604687802,7115183097,0.1548146050008654,293.97608319989524,2828,5691,2,0,0
+7321870107,1447654177,0.2688118839978415,381.1074473935305,2827,5691,2,0,0
+2360479287,317767226,0.11585163899871986,364.56976540113374,2828,5691,2,0,0
+1934188869,418009256,1.0117086669997661,894.0178162972176,2827,5691,2,0,0
+2623041440,938229662,0.006024514997989172,78.88062349750348,2828,5691,2,0,0
+3273193624,317841013,0.006774497000151314,112.2768119941219,2827,5691,2,0,0
+7031883143,1718397716,0.1670217450009659,316.64780752530135,2828,5691,3,0,0
+1937178503,1672267797,0.10747483500017552,872.2806195648016,2827,5691,3,0,0
+306639015,408478834,0.4979987770020671,733.7369613783485,2828,5691,3,0,0
+2616462188,2604992884,0.1946484869986307,278.6727003101405,2827,5691,3,0,0
+2604687802,7115183097,0.1538195260000066,293.97608319989524,2828,5691,3,0,0
+7321870107,1447654177,0.27052835900030914,381.1074473935305,2827,5691,3,0,0
+2360479287,317767226,0.1151339989992266,364.56976540113374,2828,5691,3,0,0
+1934188869,418009256,1.0350231290030933,894.0178162972176,2827,5691,3,0,0
+2623041440,938229662,0.007643552002264187,78.88062349750348,2828,5691,3,0,0
+3273193624,317841013,0.007845112999348203,112.2768119941219,2827,5691,3,0,0
diff --git a/evaluation/results/example/queries/classic.csv b/evaluation/results/example/queries/classic.csv
index dfe787e4017387c1ebb579b8515b3620626d1917..ddabd37ca3161c82b26c9c2361b866b22c1cf794 100644
--- a/evaluation/results/example/queries/classic.csv
+++ b/evaluation/results/example/queries/classic.csv
@@ -1,31 +1,31 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,dijkstra_rank
-318014972,7257113601,0.004932320998705109,303.9029199340039,2827,5691,1,1991
-4016874254,469733540,0.0020626620007533347,203.4574395036612,2827,5691,1,1012
-34053447,7140363804,0.0028764890012098476,325.54326871206933,2827,5691,1,1372
-7030609384,474997016,0.0026195680002274457,354.32678807490765,2827,5691,1,1297
-321209228,503294825,0.00503171300078975,531.9688537252507,2827,5691,1,2278
-6001596194,34053443,0.00010401799954706803,None,2827,5691,1,None
-1778028226,2591134812,0.0054988889987726,730.261875045356,2827,5691,1,2522
-408478761,574727021,0.00467671399928804,565.2289730244942,2827,5691,1,2095
-2379050788,3307706689,0.004561318999549258,384.0706971765939,2827,5691,1,2120
-2635713649,1937172847,0.0056830279991118005,686.100743161775,2827,5691,1,2696
-318014972,7257113601,0.005100334999951883,303.9029199340039,2827,5691,2,1991
-4016874254,469733540,0.002235026000562357,203.4574395036612,2827,5691,2,1012
-34053447,7140363804,0.0028103049990022555,325.54326871206933,2827,5691,2,1372
-7030609384,474997016,0.0026100559989572503,354.32678807490765,2827,5691,2,1297
-321209228,503294825,0.004990438999811886,531.9688537252507,2827,5691,2,2278
-6001596194,34053443,0.00014139399900159333,None,2827,5691,2,None
-1778028226,2591134812,0.005460116000904236,730.261875045356,2827,5691,2,2522
-408478761,574727021,0.0046940519987401785,565.2289730244942,2827,5691,2,2095
-2379050788,3307706689,0.004553816999759874,384.0706971765939,2827,5691,2,2120
-2635713649,1937172847,0.005745967999246204,686.100743161775,2827,5691,2,2696
-318014972,7257113601,0.004941948000123375,303.9029199340039,2827,5691,3,1991
-4016874254,469733540,0.0021577469997282606,203.4574395036612,2827,5691,3,1012
-34053447,7140363804,0.0028441800004657125,325.54326871206933,2827,5691,3,1372
-7030609384,474997016,0.0026651249991118675,354.32678807490765,2827,5691,3,1297
-321209228,503294825,0.004930135999529739,531.9688537252507,2827,5691,3,2278
-6001596194,34053443,0.00010149400077352766,None,2827,5691,3,None
-1778028226,2591134812,0.005449285999929998,730.261875045356,2827,5691,3,2522
-408478761,574727021,0.004721971999970265,565.2289730244942,2827,5691,3,2095
-2379050788,3307706689,0.004648890000680694,384.0706971765939,2827,5691,3,2120
-2635713649,1937172847,0.005686548000085168,686.100743161775,2827,5691,3,2696
+7031883143,1718397716,0.002887532002205262,316.64780752530135,2827,5691,1,1110
+1937178503,1672267797,0.002439022999169538,872.2806195648016,2827,5691,1,1098
+306639015,408478834,0.004828910001378972,733.7369613783485,2827,5691,1,2223
+2616462188,2604992884,0.0027013259968953207,278.6727003101405,2827,5691,1,1114
+2604687802,7115183097,0.0021728840001742356,293.97608319989524,2827,5691,1,1062
+7321870107,1447654177,0.0034450940001988783,381.1074473935305,2827,5691,1,1581
+2360479287,317767226,0.002077197001199238,364.56976540113374,2827,5691,1,1033
+1934188869,418009256,0.005599799998890376,894.0178162972176,2827,5691,1,2661
+2623041440,938229662,5.918900205870159e-05,78.88062349750348,2827,5691,1,25
+3273193624,317841013,7.611799810547382e-05,112.2768119941219,2827,5691,1,35
+7031883143,1718397716,0.0028611609996005427,316.64780752530135,2827,5691,2,1110
+1937178503,1672267797,0.0023764979996485636,872.2806195648016,2827,5691,2,1098
+306639015,408478834,0.004955427000822965,733.7369613783485,2827,5691,2,2223
+2616462188,2604992884,0.002268469997943612,278.6727003101405,2827,5691,2,1114
+2604687802,7115183097,0.0021001040004193783,293.97608319989524,2827,5691,2,1062
+7321870107,1447654177,0.003340944000228774,381.1074473935305,2827,5691,2,1581
+2360479287,317767226,0.0020764179971592966,364.56976540113374,2827,5691,2,1033
+1934188869,418009256,0.005624393001198769,894.0178162972176,2827,5691,2,2661
+2623041440,938229662,5.813100142404437e-05,78.88062349750348,2827,5691,2,25
+3273193624,317841013,7.795099736540578e-05,112.2768119941219,2827,5691,2,35
+7031883143,1718397716,0.0027895900020666886,316.64780752530135,2827,5691,3,1110
+1937178503,1672267797,0.002396080999460537,872.2806195648016,2827,5691,3,1098
+306639015,408478834,0.004990563997125719,733.7369613783485,2827,5691,3,2223
+2616462188,2604992884,0.002242526999907568,278.6727003101405,2827,5691,3,1114
+2604687802,7115183097,0.0021727730018028524,293.97608319989524,2827,5691,3,1062
+7321870107,1447654177,0.0033488900007796474,381.1074473935305,2827,5691,3,1581
+2360479287,317767226,0.002049781000096118,364.56976540113374,2827,5691,3,1033
+1934188869,418009256,0.0054854579975653905,894.0178162972176,2827,5691,3,2661
+2623041440,938229662,5.894499918213114e-05,78.88062349750348,2827,5691,3,25
+3273193624,317841013,7.775899939588271e-05,112.2768119941219,2827,5691,3,35
diff --git a/evaluation/results/example/queries/gasstation.csv b/evaluation/results/example/queries/gasstation.csv
index 9f7d15b28f7491813e106615f45c79051ae31ddb..c0e044f9fac5c6001169f0bc2a9e1446e5c95801 100644
--- a/evaluation/results/example/queries/gasstation.csv
+++ b/evaluation/results/example/queries/gasstation.csv
@@ -1,31 +1,31 @@
-start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,time_contracted_graph,time_state_graph
-318014972,7257113601,0.009924058000251534,303.9029199340039,2827,5691,1,0.00010468700020282995,2.7305000912747346e-05
-4016874254,469733540,0.006778732999009662,203.4574395036612,2827,5691,1,0.00010468700020282995,2.7305000912747346e-05
-34053447,7140363804,0.009821476000070106,325.54326871206933,2827,5691,1,0.00010468700020282995,2.7305000912747346e-05
-7030609384,474997016,0.009490974000073038,354.32678807490765,2827,5691,1,0.00010468700020282995,2.7305000912747346e-05
-321209228,503294825,0.018831139999747393,531.9688537252507,2827,5691,1,0.00010468700020282995,2.7305000912747346e-05
-6001596194,34053443,0.0006385369997587986,None,2827,5691,1,0.00010468700020282995,2.7305000912747346e-05
-1778028226,2591134812,0.020560556000418728,730.261875045356,2827,5691,1,0.00010468700020282995,2.7305000912747346e-05
-408478761,574727021,0.00982461700004933,565.2289730244942,2827,5691,1,0.00010468700020282995,2.7305000912747346e-05
-2379050788,3307706689,0.01150487700033409,384.0706971765939,2827,5691,1,0.00010468700020282995,2.7305000912747346e-05
-2635713649,1937172847,0.02489729199987778,686.100743161775,2827,5691,1,0.00010468700020282995,2.7305000912747346e-05
-318014972,7257113601,0.009617293999326648,303.9029199340039,2827,5691,2,0.00489382700106944,0.00012879600035375915
-4016874254,469733540,0.006334065999908489,203.4574395036612,2827,5691,2,0.00489382700106944,0.00012879600035375915
-34053447,7140363804,0.009545827000692952,325.54326871206933,2827,5691,2,0.00489382700106944,0.00012879600035375915
-7030609384,474997016,0.009233517999746255,354.32678807490765,2827,5691,2,0.00489382700106944,0.00012879600035375915
-321209228,503294825,0.01852785700066306,531.9688537252507,2827,5691,2,0.00489382700106944,0.00012879600035375915
-6001596194,34053443,0.0006094979999033967,None,2827,5691,2,0.00489382700106944,0.00012879600035375915
-1778028226,2591134812,0.020256398000128684,730.261875045356,2827,5691,2,0.00489382700106944,0.00012879600035375915
-408478761,574727021,0.009198958001434221,565.2289730244942,2827,5691,2,0.00489382700106944,0.00012879600035375915
-2379050788,3307706689,0.010785397000290686,384.0706971765939,2827,5691,2,0.00489382700106944,0.00012879600035375915
-2635713649,1937172847,0.02442903199880675,686.100743161775,2827,5691,2,0.00489382700106944,0.00012879600035375915
-318014972,7257113601,0.009560399999827496,303.9029199340039,2827,5691,3,0.03369906199986872,0.00019228500059398357
-4016874254,469733540,0.0063881980004225625,203.4574395036612,2827,5691,3,0.03369906199986872,0.00019228500059398357
-34053447,7140363804,0.009494572999756201,325.54326871206933,2827,5691,3,0.03369906199986872,0.00019228500059398357
-7030609384,474997016,0.009447712000110187,354.32678807490765,2827,5691,3,0.03369906199986872,0.00019228500059398357
-321209228,503294825,0.018636861999766552,531.9688537252507,2827,5691,3,0.03369906199986872,0.00019228500059398357
-6001596194,34053443,0.0006008959990140283,None,2827,5691,3,0.03369906199986872,0.00019228500059398357
-1778028226,2591134812,0.020459575998756918,730.261875045356,2827,5691,3,0.03369906199986872,0.00019228500059398357
-408478761,574727021,0.009150286001386121,565.2289730244942,2827,5691,3,0.03369906199986872,0.00019228500059398357
-2379050788,3307706689,0.010963099000946386,384.0706971765939,2827,5691,3,0.03369906199986872,0.00019228500059398357
-2635713649,1937172847,0.024877044001186732,686.100743161775,2827,5691,3,0.03369906199986872,0.00019228500059398357
+start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,charging_stops,charging_time,time_contracted_graph,time_state_graph,nodes_state_graph,edges_state_graph
+7031883143,1718397716,0.007334264999371953,316.64780752530135,2827,5691,1,0,0,0.00010669000039342791,2.6967001758748665e-05,0,0
+1937178503,1672267797,0.008130487000016728,872.2806195648016,2827,5691,1,0,0,0.00010669000039342791,2.6967001758748665e-05,0,0
+306639015,408478834,0.015824670997972135,733.7369613783485,2827,5691,1,0,0,0.00010669000039342791,2.6967001758748665e-05,0,0
+2616462188,2604992884,0.006570735000423156,278.6727003101405,2827,5691,1,0,0,0.00010669000039342791,2.6967001758748665e-05,0,0
+2604687802,7115183097,0.0047696449983050115,293.97608319989524,2827,5691,1,0,0,0.00010669000039342791,2.6967001758748665e-05,0,0
+7321870107,1447654177,0.01166121800270048,381.1074473935305,2827,5691,1,0,0,0.00010669000039342791,2.6967001758748665e-05,0,0
+2360479287,317767226,0.004671858001529472,364.56976540113374,2827,5691,1,0,0,0.00010669000039342791,2.6967001758748665e-05,0,0
+1934188869,418009256,0.025074755001696758,894.0178162972176,2827,5691,1,0,0,0.00010669000039342791,2.6967001758748665e-05,0,0
+2623041440,938229662,0.00024073000167845748,78.88062349750348,2827,5691,1,0,0,0.00010669000039342791,2.6967001758748665e-05,0,0
+3273193624,317841013,0.00037095700099598616,112.2768119941219,2827,5691,1,0,0,0.00010669000039342791,2.6967001758748665e-05,0,0
+7031883143,1718397716,0.007571023998025339,316.64780752530135,2827,5691,2,0,0,0.010836729998118244,5.511899871635251e-05,2,2
+1937178503,1672267797,0.008790342002612306,872.2806195648016,2827,5691,2,0,0,0.010836729998118244,5.511899871635251e-05,2,2
+306639015,408478834,0.01919965500201215,733.7369613783485,2827,5691,2,0,0,0.010836729998118244,5.511899871635251e-05,2,2
+2616462188,2604992884,0.007197317998361541,278.6727003101405,2827,5691,2,0,0,0.010836729998118244,5.511899871635251e-05,2,2
+2604687802,7115183097,0.0058462769993639085,293.97608319989524,2827,5691,2,0,0,0.010836729998118244,5.511899871635251e-05,2,2
+7321870107,1447654177,0.011976981000771048,381.1074473935305,2827,5691,2,0,0,0.010836729998118244,5.511899871635251e-05,2,2
+2360479287,317767226,0.00471422099872143,364.56976540113374,2827,5691,2,0,0,0.010836729998118244,5.511899871635251e-05,2,2
+1934188869,418009256,0.02775761300290469,894.0178162972176,2827,5691,2,0,0,0.010836729998118244,5.511899871635251e-05,2,2
+2623041440,938229662,0.00024327999926754273,78.88062349750348,2827,5691,2,0,0,0.010836729998118244,5.511899871635251e-05,2,2
+3273193624,317841013,0.00035863800076185726,112.2768119941219,2827,5691,2,0,0,0.010836729998118244,5.511899871635251e-05,2,2
+7031883143,1718397716,0.007044841000606539,316.64780752530135,2827,5691,3,0,0,0.02955482999823289,0.00012983099804841913,7,10
+1937178503,1672267797,0.008153373997629387,872.2806195648016,2827,5691,3,0,0,0.02955482999823289,0.00012983099804841913,7,10
+306639015,408478834,0.016012874999432825,733.7369613783485,2827,5691,3,0,0,0.02955482999823289,0.00012983099804841913,7,10
+2616462188,2604992884,0.006532000999868615,278.6727003101405,2827,5691,3,0,0,0.02955482999823289,0.00012983099804841913,7,10
+2604687802,7115183097,0.004617615999450209,293.97608319989524,2827,5691,3,0,0,0.02955482999823289,0.00012983099804841913,7,10
+7321870107,1447654177,0.010875609001232078,381.1074473935305,2827,5691,3,0,0,0.02955482999823289,0.00012983099804841913,7,10
+2360479287,317767226,0.005105145999550587,364.56976540113374,2827,5691,3,0,0,0.02955482999823289,0.00012983099804841913,7,10
+1934188869,418009256,0.025677154000732116,894.0178162972176,2827,5691,3,0,0,0.02955482999823289,0.00012983099804841913,7,10
+2623041440,938229662,0.0002446630023769103,78.88062349750348,2827,5691,3,0,0,0.02955482999823289,0.00012983099804841913,7,10
+3273193624,317841013,0.0003482350002741441,112.2768119941219,2827,5691,3,0,0,0.02955482999823289,0.00012983099804841913,7,10
diff --git a/evaluation/run.py b/evaluation/run.py
index 834171d746e87d7ef577decfbfe4d0ef8a2b1e3b..8ebc612fca7fbe74f73326250ef3a07763375cab 100644
--- a/evaluation/run.py
+++ b/evaluation/run.py
@@ -24,12 +24,12 @@ def query_benchmark(graphs, conf, result_dir):
charging_stations = json.load(f)
query_conf = [
+ Query(classic_query, 'classic.csv', ClassicQueryRow),
+ Query(astar_query, 'astar.csv', AStarQueryRow),
Query(query_function=gasstation_query,
filename='gasstation.csv',
row_dataclass=GasstationQueryRow),
- Query(charge_query, 'charge.csv', ChargeQueryRow),
- Query(classic_query, 'classic.csv', ClassicQueryRow),
- Query(astar_query, 'astar.csv', AStarQueryRow)
+ Query(charge_query, 'charge.csv', ChargeQueryRow)
]
# Remove existing results
diff --git a/evrouting/graph_tools.py b/evrouting/graph_tools.py
index 46a189312bb59af3bd4ff136d0e9c5f91a51b6e1..bd0c073793de2cb5383ec1d071f911374f6eab59 100644
--- a/evrouting/graph_tools.py
+++ b/evrouting/graph_tools.py
@@ -72,7 +72,7 @@ def consumption_function_distance_factory(consumption: float) -> ConsumptionFunc
def consumption_function_time_factory(consumption: float) -> ConsumptionFunction:
"""
- :param consumption: in kWh/km
+ :param consumption: in kWh/s
"""
def c(G, u, v):