From 70a791d87ba3cfacdf806dd2dc5be79f7dbf3e58 Mon Sep 17 00:00:00 2001
From: "niehues.mark@gmail.com" <niehues.mark@gmail.com>
Date: Wed, 6 May 2020 20:45:43 +0200
Subject: [PATCH] wip
---
evaluation/lib/benchmarks.py | 13 ++-
evaluation/results/example/queries/astar.csv | 60 ++++++-------
.../results/example/queries/bidirectional.csv | 60 ++++++-------
evaluation/results/example/queries/charge.csv | 90 +++++++------------
.../results/example/queries/classic.csv | 60 ++++++-------
.../results/example/queries/gasstation.csv | 60 ++++++-------
6 files changed, 156 insertions(+), 187 deletions(-)
diff --git a/evaluation/lib/benchmarks.py b/evaluation/lib/benchmarks.py
index 3ef6fd4..910d8ae 100644
--- a/evaluation/lib/benchmarks.py
+++ b/evaluation/lib/benchmarks.py
@@ -62,7 +62,6 @@ def _get_target_with_rank(graph, start_node, rank):
def query(graphs, charging_stations, conf, result_dir):
_init_result_files(result_dir)
-
for map_name, G in zip(conf['maps'], graphs):
nodes = random.sample(list(G.nodes), k=2 * conf['queries_per_setup'])
@@ -75,10 +74,11 @@ def query(graphs, charging_stations, conf, result_dir):
_insert_charging_stations(G, charging_stations, setup['charging_stations'])
# Get algorithms for this setup
- queries = [
- query_relations[key]
- for key in setup.get('algorithms', query_relations.keys())
- ]
+ algorithms = setup.get('algorithms', [
+ 'classic', 'astar', 'bidirectional', 'gasstation', 'charge'
+ ])
+ queries = [query_relations[key] for key in algorithms]
+
logger.info(f"Running queries on map {map_name}")
_run_queries(G, start_nodes, target_nodes, setup, queries, result_dir)
@@ -134,9 +134,8 @@ def init(graphs, charging_stations, conf, result_dir):
_run_queries(G, start_nodes, target_nodes, setup, queries, result_dir)
# Create state graph etc
- logger.info(f'Running {len(start_nodes)} times {func.__name__}')
func, filename, _ = query_relations['init']
-
+ logger.info(f'Running {len(start_nodes)} times {func.__name__}')
for i, (s, t) in enumerate(zip(start_nodes, target_nodes)):
logger.debug(f'{i + 1}/{len(start_nodes)}')
result_data = func(G, setup, s, t)
diff --git a/evaluation/results/example/queries/astar.csv b/evaluation/results/example/queries/astar.csv
index 2ae6797..9523067 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
-7257113602,2614920419,0.003425089998927433,234.7336669483648,2827,5691,1
-360747540,317839543,0.0001752520001900848,None,2827,5691,1
-475912311,474997358,0.014303740001196275,604.3448574846665,2827,5691,1
-288943151,661183953,0.02107892499770969,690.6292319112416,2827,5691,1
-4475742630,2600670536,0.016499384000780992,608.5541358696867,2827,5691,1
-600852676,317841014,0.0003728039991983678,15.79447577249269,2827,5691,1
-2431244615,360747697,0.025924133999069454,None,2827,5691,1
-321209230,292484328,0.02586445300039486,None,2827,5691,1
-4321209902,469718545,0.020031713000207674,515.0475136686434,2827,5691,1
-4383156580,687130893,0.02593540200177813,850.1534973588364,2827,5691,1
-7257113602,2614920419,0.0034453539992682636,234.7336669483648,2827,5691,2
-360747540,317839543,0.0001817699994717259,None,2827,5691,2
-475912311,474997358,0.014159638998535229,604.3448574846665,2827,5691,2
-288943151,661183953,0.021552178001002176,690.6292319112416,2827,5691,2
-4475742630,2600670536,0.016843181001604535,608.5541358696867,2827,5691,2
-600852676,317841014,0.0003893689972755965,15.79447577249269,2827,5691,2
-2431244615,360747697,0.025895298000250477,None,2827,5691,2
-321209230,292484328,0.025502017000690103,None,2827,5691,2
-4321209902,469718545,0.02000323700121953,515.0475136686434,2827,5691,2
-4383156580,687130893,0.02703422199920169,850.1534973588364,2827,5691,2
-7257113602,2614920419,0.0035775120013568085,234.7336669483648,2827,5691,3
-360747540,317839543,0.00023692499962635338,None,2827,5691,3
-475912311,474997358,0.016566453999985242,604.3448574846665,2827,5691,3
-288943151,661183953,0.024229221999121364,690.6292319112416,2827,5691,3
-4475742630,2600670536,0.018492909999622498,608.5541358696867,2827,5691,3
-600852676,317841014,0.0004649639995477628,15.79447577249269,2827,5691,3
-2431244615,360747697,0.029205666000052588,None,2827,5691,3
-321209230,292484328,0.027609084001596784,None,2827,5691,3
-4321209902,469718545,0.02324765899902559,515.0475136686434,2827,5691,3
-4383156580,687130893,0.026546643999608932,850.1534973588364,2827,5691,3
+317839257,365065404,0.01985237800181494,482.3482801266241,2827,5691,1
+4955445807,306636853,0.011611627000092994,483.27295262816904,2827,5691,1
+574465010,2614897354,0.0011155710017192177,76.08435116548294,2827,5691,1
+6001542026,7115126884,0.00018327599900658242,None,2827,5691,1
+549922866,2997117854,0.0185076689995185,437.3666210341159,2827,5691,1
+475912312,408478746,0.02594075500019244,1335.1856439163962,2827,5691,1
+2604685993,292725114,0.026263269999617478,None,2827,5691,1
+306639025,2623041440,0.019357363002200145,624.5015845003608,2827,5691,1
+748845491,7202546043,0.0078268620018207,273.68697234782496,2827,5691,1
+1979730425,1934189601,0.006987444001424592,465.34941712776924,2827,5691,1
+317839257,365065404,0.02016585099772783,482.3482801266241,2827,5691,2
+4955445807,306636853,0.011617680997005664,483.27295262816904,2827,5691,2
+574465010,2614897354,0.0012418199985404499,76.08435116548294,2827,5691,2
+6001542026,7115126884,0.00021283199748722836,None,2827,5691,2
+549922866,2997117854,0.01843689200177323,437.3666210341159,2827,5691,2
+475912312,408478746,0.02653488099895185,1335.1856439163962,2827,5691,2
+2604685993,292725114,0.026920344000245677,None,2827,5691,2
+306639025,2623041440,0.019381858000997454,624.5015845003608,2827,5691,2
+748845491,7202546043,0.007983285999216605,273.68697234782496,2827,5691,2
+1979730425,1934189601,0.007092138999723829,465.34941712776924,2827,5691,2
+317839257,365065404,0.020114238999667577,482.3482801266241,2827,5691,3
+4955445807,306636853,0.01167599399923347,483.27295262816904,2827,5691,3
+574465010,2614897354,0.001134473001002334,76.08435116548294,2827,5691,3
+6001542026,7115126884,0.00018460999854141846,None,2827,5691,3
+549922866,2997117854,0.01852128999962588,437.3666210341159,2827,5691,3
+475912312,408478746,0.026657979000447085,1335.1856439163962,2827,5691,3
+2604685993,292725114,0.026771385997562902,None,2827,5691,3
+306639025,2623041440,0.020332051997684175,624.5015845003608,2827,5691,3
+748845491,7202546043,0.008069724000961287,273.68697234782496,2827,5691,3
+1979730425,1934189601,0.007269442998222075,465.34941712776924,2827,5691,3
diff --git a/evaluation/results/example/queries/bidirectional.csv b/evaluation/results/example/queries/bidirectional.csv
index 4e3184c..5277732 100644
--- a/evaluation/results/example/queries/bidirectional.csv
+++ b/evaluation/results/example/queries/bidirectional.csv
@@ -1,31 +1,31 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
-7257113602,2614920419,0.0024938649985415395,234.73366694836477,2827,5691,1
-360747540,317839543,0.00023680300000705756,None,2827,5691,1
-475912311,474997358,0.002441155000269646,604.3448574846666,2827,5691,1
-288943151,661183953,0.014152913998259464,690.6292319112414,2827,5691,1
-4475742630,2600670536,0.005746017999626929,608.5541358696867,2827,5691,1
-600852676,317841014,0.00019180799790774472,15.79447577249269,2827,5691,1
-2431244615,360747697,7.557899880339392e-05,None,2827,5691,1
-321209230,292484328,0.0007444590009981766,None,2827,5691,1
-4321209902,469718545,0.011361551001755288,515.0475136686433,2827,5691,1
-4383156580,687130893,0.01430811300087953,850.1534973588364,2827,5691,1
-7257113602,2614920419,0.002172327000153018,234.73366694836477,2827,5691,2
-360747540,317839543,0.0003706520001287572,None,2827,5691,2
-475912311,474997358,0.0022838080003566574,604.3448574846666,2827,5691,2
-288943151,661183953,0.015897211000265088,690.6292319112414,2827,5691,2
-4475742630,2600670536,0.007147289001295576,608.5541358696867,2827,5691,2
-600852676,317841014,0.0001917690024129115,15.79447577249269,2827,5691,2
-2431244615,360747697,7.704100062255748e-05,None,2827,5691,2
-321209230,292484328,0.0008020479981496464,None,2827,5691,2
-4321209902,469718545,0.01499502699880395,515.0475136686433,2827,5691,2
-4383156580,687130893,0.015399750001961365,850.1534973588364,2827,5691,2
-7257113602,2614920419,0.0023540750007668976,234.73366694836477,2827,5691,3
-360747540,317839543,0.00020862200108240359,None,2827,5691,3
-475912311,474997358,0.002252874997793697,604.3448574846666,2827,5691,3
-288943151,661183953,0.013268393999169348,690.6292319112414,2827,5691,3
-4475742630,2600670536,0.005893120000109775,608.5541358696867,2827,5691,3
-600852676,317841014,0.0001957059976120945,15.79447577249269,2827,5691,3
-2431244615,360747697,7.633199857082218e-05,None,2827,5691,3
-321209230,292484328,0.0006991549998929258,None,2827,5691,3
-4321209902,469718545,0.011508765001053689,515.0475136686433,2827,5691,3
-4383156580,687130893,0.01308444300229894,850.1534973588364,2827,5691,3
+317839257,365065404,0.010422236999147572,482.3482801266242,2827,5691,1
+4955445807,306636853,0.006636581998463953,483.27295262816915,2827,5691,1
+574465010,2614897354,0.0008585819996369537,76.08435116548293,2827,5691,1
+6001542026,7115126884,0.0002701499979593791,None,2827,5691,1
+549922866,2997117854,0.00758516700079781,437.36662103411584,2827,5691,1
+475912312,408478746,0.011699277001753217,1335.185643916396,2827,5691,1
+2604685993,292725114,0.0005275000003166497,None,2827,5691,1
+306639025,2623041440,0.011539893999724882,624.5015845003607,2827,5691,1
+748845491,7202546043,0.0015457190020242706,273.68697234782496,2827,5691,1
+1979730425,1934189601,0.0025114660020335577,465.34941712776936,2827,5691,1
+317839257,365065404,0.01068368399864994,482.3482801266242,2827,5691,2
+4955445807,306636853,0.006482246000814484,483.27295262816915,2827,5691,2
+574465010,2614897354,0.0008615609986009076,76.08435116548293,2827,5691,2
+6001542026,7115126884,0.0004631340016203467,None,2827,5691,2
+549922866,2997117854,0.007801939002092695,437.36662103411584,2827,5691,2
+475912312,408478746,0.012849401002313243,1335.185643916396,2827,5691,2
+2604685993,292725114,0.0004226220007694792,None,2827,5691,2
+306639025,2623041440,0.012500708999141352,624.5015845003607,2827,5691,2
+748845491,7202546043,0.0017303649983659852,273.68697234782496,2827,5691,2
+1979730425,1934189601,0.0026854399984586053,465.34941712776936,2827,5691,2
+317839257,365065404,0.01292253299834556,482.3482801266242,2827,5691,3
+4955445807,306636853,0.005820278001920087,483.27295262816915,2827,5691,3
+574465010,2614897354,0.0008766920000198297,76.08435116548293,2827,5691,3
+6001542026,7115126884,0.00024458900224999525,None,2827,5691,3
+549922866,2997117854,0.007153796999773476,437.36662103411584,2827,5691,3
+475912312,408478746,0.014407106998987729,1335.185643916396,2827,5691,3
+2604685993,292725114,0.00046832199950586073,None,2827,5691,3
+306639025,2623041440,0.01179616000081296,624.5015845003607,2827,5691,3
+748845491,7202546043,0.0015532440011156723,273.68697234782496,2827,5691,3
+1979730425,1934189601,0.0029722469989792444,465.34941712776936,2827,5691,3
diff --git a/evaluation/results/example/queries/charge.csv b/evaluation/results/example/queries/charge.csv
index 1e47cf3..02d4dd7 100644
--- a/evaluation/results/example/queries/charge.csv
+++ b/evaluation/results/example/queries/charge.csv
@@ -1,61 +1,31 @@
start_node,target_node,query_time,time_contracted_graph,time_state_graph,nodes_state_graph,edges_state_graph,nodes_contracted_graph,edges_contracted_graph
-7257113602,2614920419,0.04417361699961475,234.7336669483648,2828,5691,1,0,0
-360747540,317839543,0.005578544998570578,None,2827,5691,1,0,0
-475912311,474997358,0.22231816099883872,604.3448574846665,2828,5691,1,0,0
-288943151,661183953,0.33749997400082066,690.6292319112416,2827,5691,1,0,0
-4475742630,2600670536,0.25029388700204436,608.5541358696867,2828,5691,1,0,0
-600852676,317841014,0.006943453998246696,15.79447577249269,2827,5691,1,0,0
-2431244615,360747697,0.7127236289998109,None,2828,5691,1,0,0
-321209230,292484328,0.8131562290000147,None,2827,5691,1,0,0
-4321209902,469718545,0.5710137329988356,515.0475136686434,2828,5691,1,0,0
-4383156580,687130893,0.7911051690025488,850.1534973588364,2827,5691,1,0,0
-7257113602,2614920419,0.039505632001237245,234.7336669483648,2828,5691,1,0,0
-360747540,317839543,0.004337693000707077,None,2827,5691,1,0,0
-475912311,474997358,0.23100137299843482,604.3448574846665,2828,5691,1,0,0
-288943151,661183953,0.3457401560008293,690.6292319112416,2827,5691,1,0,0
-4475742630,2600670536,0.2576170880020072,608.5541358696867,2828,5691,1,0,0
-600852676,317841014,0.007051110002066707,15.79447577249269,2827,5691,1,0,0
-2431244615,360747697,0.7302340659989568,None,2828,5691,1,0,0
-321209230,292484328,0.8457804139979999,None,2827,5691,1,0,0
-4321209902,469718545,0.5734661419992335,515.0475136686434,2828,5691,1,0,0
-4383156580,687130893,0.7975812110016705,850.1534973588364,2827,5691,1,0,0
-7257113602,2614920419,0.04413134300193633,234.7336669483648,2828,5691,2,0,0
-360747540,317839543,0.005301458997564623,None,2827,5691,2,0,0
-475912311,474997358,0.3484835259987449,604.3448574846665,2828,5691,2,0,0
-288943151,661183953,0.5715702339985,690.6292319112416,2827,5691,2,0,0
-4475742630,2600670536,0.4609526240019477,608.5541358696867,2828,5691,2,0,0
-600852676,317841014,0.007031798999378225,15.79447577249269,2827,5691,2,0,0
-2431244615,360747697,0.7271346319976146,None,2828,5691,2,0,0
-321209230,292484328,1.1185276030009845,None,2827,5691,2,0,0
-4321209902,469718545,0.7003590410022298,515.0475136686434,2828,5691,2,0,0
-4383156580,687130893,1.0292930379982863,850.1534973588364,2827,5691,2,0,0
-7257113602,2614920419,0.04167314300138969,234.7336669483648,2828,5691,2,0,0
-360747540,317839543,0.004437187002622522,None,2827,5691,2,0,0
-475912311,474997358,0.34496584499720484,604.3448574846665,2828,5691,2,0,0
-288943151,661183953,0.5729073639995477,690.6292319112416,2827,5691,2,0,0
-4475742630,2600670536,0.451093657000456,608.5541358696867,2828,5691,2,0,0
-600852676,317841014,0.007082921001710929,15.79447577249269,2827,5691,2,0,0
-2431244615,360747697,0.7007734369981335,None,2828,5691,2,0,0
-321209230,292484328,1.1660108550022414,None,2827,5691,2,0,0
-4321209902,469718545,0.7000758499998483,515.0475136686434,2828,5691,2,0,0
-4383156580,687130893,1.0249772860006487,850.1534973588364,2827,5691,2,0,0
-7257113602,2614920419,0.04038945399952354,234.7336669483648,2828,5691,3,0,0
-360747540,317839543,0.004385509000712773,None,2827,5691,3,0,0
-475912311,474997358,0.3832064130001527,604.3448574846665,2828,5691,3,0,0
-288943151,661183953,0.6150414959993213,690.6292319112416,2827,5691,3,0,0
-4475742630,2600670536,0.4840831729998172,608.5541358696867,2828,5691,3,0,0
-600852676,317841014,0.007041312001092592,15.79447577249269,2827,5691,3,0,0
-2431244615,360747697,0.7734838469987153,None,2828,5691,3,0,0
-321209230,292484328,1.1656792079993465,None,2827,5691,3,0,0
-4321209902,469718545,0.7038088709996373,515.0475136686434,2828,5691,3,0,0
-4383156580,687130893,1.0459808870000415,850.1534973588364,2827,5691,3,0,0
-7257113602,2614920419,0.03892015700330376,234.7336669483648,2828,5691,3,0,0
-360747540,317839543,0.004218695998133626,None,2827,5691,3,0,0
-475912311,474997358,0.3512326160016528,604.3448574846665,2828,5691,3,0,0
-288943151,661183953,0.5784528069998487,690.6292319112416,2827,5691,3,0,0
-4475742630,2600670536,0.4557092239992926,608.5541358696867,2828,5691,3,0,0
-600852676,317841014,0.007286233998456737,15.79447577249269,2827,5691,3,0,0
-2431244615,360747697,0.7106638779987406,None,2828,5691,3,0,0
-321209230,292484328,1.1356648719993245,None,2827,5691,3,0,0
-4321209902,469718545,0.694794005001313,515.0475136686434,2828,5691,3,0,0
-4383156580,687130893,1.059437167001306,850.1534973588364,2827,5691,3,0,0
+317839257,365065404,0.37174618899734924,482.3482801266241,2828,5691,1,0,0
+4955445807,306636853,0.2541482480010018,483.27295262816904,2827,5691,1,0,0
+574465010,2614897354,0.01657313699979568,76.08435116548294,2828,5691,1,0,0
+6001542026,7115126884,0.004157701001531677,None,2827,5691,1,0,0
+549922866,2997117854,0.34472123000159627,437.3666210341159,2828,5691,1,0,0
+475912312,408478746,0.7718096699973103,1335.1856439163962,2827,5691,1,0,0
+2604685993,292725114,0.5270071260019904,None,2828,5691,1,0,0
+306639025,2623041440,0.46011884700055816,624.5015845003608,2827,5691,1,0,0
+748845491,7202546043,0.10059536699918681,273.68697234782496,2828,5691,1,0,0
+1979730425,1934189601,0.1251381929978379,465.34941712776924,2827,5691,1,0,0
+317839257,365065404,0.37976430900016567,482.3482801266241,2828,5691,2,0,0
+4955445807,306636853,0.2553519739994954,483.27295262816904,2827,5691,2,0,0
+574465010,2614897354,0.01627653899777215,76.08435116548294,2828,5691,2,0,0
+6001542026,7115126884,0.004462020999199012,None,2827,5691,2,0,0
+549922866,2997117854,0.35899029099891777,437.3666210341159,2828,5691,2,0,0
+475912312,408478746,0.8082677820020763,1335.1856439163962,2827,5691,2,0,0
+2604685993,292725114,0.5546956789985416,None,2828,5691,2,0,0
+306639025,2623041440,0.48350931000095443,624.5015845003608,2827,5691,2,0,0
+748845491,7202546043,0.1001211910006532,273.68697234782496,2828,5691,2,0,0
+1979730425,1934189601,0.12851317300010123,465.34941712776924,2827,5691,2,0,0
+317839257,365065404,0.4812578029996075,482.3482801266241,2828,5691,3,0,0
+4955445807,306636853,0.2585567579990311,483.27295262816904,2827,5691,3,0,0
+574465010,2614897354,0.01628906399855623,76.08435116548294,2828,5691,3,0,0
+6001542026,7115126884,0.004293261001294013,None,2827,5691,3,0,0
+549922866,2997117854,0.3925411570016877,437.3666210341159,2828,5691,3,0,0
+475912312,408478746,0.7734852160028822,1335.1856439163962,2827,5691,3,0,0
+2604685993,292725114,0.6844992539990926,None,2828,5691,3,0,0
+306639025,2623041440,0.5058610170017346,624.5015845003608,2827,5691,3,0,0
+748845491,7202546043,0.19229627999811783,273.68697234782496,2828,5691,3,0,0
+1979730425,1934189601,0.18632115899890778,465.34941712776924,2827,5691,3,0,0
diff --git a/evaluation/results/example/queries/classic.csv b/evaluation/results/example/queries/classic.csv
index 7d4f7e0..d82cbe9 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
-7257113602,2614920419,0.0011558799997146707,234.7336669483648,2827,5691,1,419
-360747540,317839543,4.3545001972233877e-05,None,2827,5691,1,None
-475912311,474997358,0.004979000001185341,604.3448574846665,2827,5691,1,1925
-288943151,661183953,0.006015088998537976,690.6292319112416,2827,5691,1,2454
-4475742630,2600670536,0.005340313997294288,608.5541358696867,2827,5691,1,2125
-600852676,317841014,0.00012513399997260422,15.79447577249269,2827,5691,1,43
-2431244615,360747697,0.006709844001306919,None,2827,5691,1,None
-321209230,292484328,0.006763671997759957,None,2827,5691,1,None
-4321209902,469718545,0.005814049000036903,515.0475136686434,2827,5691,1,2364
-4383156580,687130893,0.006802560998039553,850.1534973588364,2827,5691,1,2693
-7257113602,2614920419,0.0011122520008939318,234.7336669483648,2827,5691,2,419
-360747540,317839543,4.43459975940641e-05,None,2827,5691,2,None
-475912311,474997358,0.004983306000212906,604.3448574846665,2827,5691,2,1925
-288943151,661183953,0.006096760000218637,690.6292319112416,2827,5691,2,2454
-4475742630,2600670536,0.0053229869990900625,608.5541358696867,2827,5691,2,2125
-600852676,317841014,0.00012281499948585406,15.79447577249269,2827,5691,2,43
-2431244615,360747697,0.008665500001370674,None,2827,5691,2,None
-321209230,292484328,0.007027558000118006,None,2827,5691,2,None
-4321209902,469718545,0.00606389200038393,515.0475136686434,2827,5691,2,2364
-4383156580,687130893,0.006716875999700278,850.1534973588364,2827,5691,2,2693
-7257113602,2614920419,0.001425022001058096,234.7336669483648,2827,5691,3,419
-360747540,317839543,4.8619996960042045e-05,None,2827,5691,3,None
-475912311,474997358,0.006033845998899778,604.3448574846665,2827,5691,3,1925
-288943151,661183953,0.007887597999797435,690.6292319112416,2827,5691,3,2454
-4475742630,2600670536,0.006198561000928748,608.5541358696867,2827,5691,3,2125
-600852676,317841014,0.00013953099914942868,15.79447577249269,2827,5691,3,43
-2431244615,360747697,0.0084671119984705,None,2827,5691,3,None
-321209230,292484328,0.007889581000199541,None,2827,5691,3,None
-4321209902,469718545,0.007892913999967277,515.0475136686434,2827,5691,3,2364
-4383156580,687130893,0.009008050998090766,850.1534973588364,2827,5691,3,2693
+317839257,365065404,0.0065978940001514275,482.3482801266241,2827,5691,1,2453
+4955445807,306636853,0.0036506020005617756,483.27295262816904,2827,5691,1,1494
+574465010,2614897354,0.0004031790012959391,76.08435116548294,2827,5691,1,159
+6001542026,7115126884,4.8642999900039285e-05,None,2827,5691,1,None
+549922866,2997117854,0.005889076997846132,437.3666210341159,2827,5691,1,2245
+475912312,408478746,0.006802701998822158,1335.1856439163962,2827,5691,1,2752
+2604685993,292725114,0.006801669998822035,None,2827,5691,1,None
+306639025,2623041440,0.005445237999083474,624.5015845003608,2827,5691,1,2288
+748845491,7202546043,0.0025026399998751003,273.68697234782496,2827,5691,1,1094
+1979730425,1934189601,0.003396405001694802,465.34941712776924,2827,5691,1,1389
+317839257,365065404,0.00649445400267723,482.3482801266241,2827,5691,2,2453
+4955445807,306636853,0.0037121599998499732,483.27295262816904,2827,5691,2,1494
+574465010,2614897354,0.00042038800165755674,76.08435116548294,2827,5691,2,159
+6001542026,7115126884,3.973300044890493e-05,None,2827,5691,2,None
+549922866,2997117854,0.005601845001365291,437.3666210341159,2827,5691,2,2245
+475912312,408478746,0.0070095849987410475,1335.1856439163962,2827,5691,2,2752
+2604685993,292725114,0.006945514000108233,None,2827,5691,2,None
+306639025,2623041440,0.005808161000459222,624.5015845003608,2827,5691,2,2288
+748845491,7202546043,0.0026305989995307755,273.68697234782496,2827,5691,2,1094
+1979730425,1934189601,0.0032398210023529828,465.34941712776924,2827,5691,2,1389
+317839257,365065404,0.006738230000337353,482.3482801266241,2827,5691,3,2453
+4955445807,306636853,0.003759642000659369,483.27295262816904,2827,5691,3,1494
+574465010,2614897354,0.0004540610025287606,76.08435116548294,2827,5691,3,159
+6001542026,7115126884,4.0134997107088566e-05,None,2827,5691,3,None
+549922866,2997117854,0.005503216001670808,437.3666210341159,2827,5691,3,2245
+475912312,408478746,0.007068164999509463,1335.1856439163962,2827,5691,3,2752
+2604685993,292725114,0.007019616998150013,None,2827,5691,3,None
+306639025,2623041440,0.005773699998826487,624.5015845003608,2827,5691,3,2288
+748845491,7202546043,0.0028941010023117997,273.68697234782496,2827,5691,3,1094
+1979730425,1934189601,0.0033469179979874752,465.34941712776924,2827,5691,3,1389
diff --git a/evaluation/results/example/queries/gasstation.csv b/evaluation/results/example/queries/gasstation.csv
index 095144c..b642328 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,charging_stops,charging_time,time_contracted_graph,time_state_graph,nodes_state_graph,edges_state_graph
-7257113602,2614920419,0.00366084800043609,234.7336669483648,2827,5691,1,0,0,7.73779975133948e-05,2.7985999622615054e-05,0,0
-360747540,317839543,0.00018435500169289298,None,2827,5691,1,0,0,7.73779975133948e-05,2.7985999622615054e-05,0,0
-475912311,474997358,0.01416455500293523,604.3448574846665,2827,5691,1,0,0,7.73779975133948e-05,2.7985999622615054e-05,0,0
-288943151,661183953,0.02157536300001084,690.6292319112416,2827,5691,1,0,0,7.73779975133948e-05,2.7985999622615054e-05,0,0
-4475742630,2600670536,0.016644380000798265,608.5541358696867,2827,5691,1,0,0,7.73779975133948e-05,2.7985999622615054e-05,0,0
-600852676,317841014,0.00037730500116595067,15.79447577249269,2827,5691,1,0,0,7.73779975133948e-05,2.7985999622615054e-05,0,0
-2431244615,360747697,0.02574609099974623,None,2827,5691,1,0,0,7.73779975133948e-05,2.7985999622615054e-05,0,0
-321209230,292484328,0.025969820002501365,None,2827,5691,1,0,0,7.73779975133948e-05,2.7985999622615054e-05,0,0
-4321209902,469718545,0.02065769999899203,515.0475136686434,2827,5691,1,0,0,7.73779975133948e-05,2.7985999622615054e-05,0,0
-4383156580,687130893,0.02732778499921551,850.1534973588364,2827,5691,1,0,0,7.73779975133948e-05,2.7985999622615054e-05,0,0
-7257113602,2614920419,0.004108856999664567,234.7336669483648,2827,5691,2,0,0,0.013347836000320967,6.441799996537156e-05,2,2
-360747540,317839543,0.0002651780014275573,None,2827,5691,2,0,0,0.013347836000320967,6.441799996537156e-05,2,2
-475912311,474997358,0.01514115700047114,604.3448574846665,2827,5691,2,0,0,0.013347836000320967,6.441799996537156e-05,2,2
-288943151,661183953,0.023305662001803285,690.6292319112416,2827,5691,2,0,0,0.013347836000320967,6.441799996537156e-05,2,2
-4475742630,2600670536,0.017676034000032814,608.5541358696867,2827,5691,2,0,0,0.013347836000320967,6.441799996537156e-05,2,2
-600852676,317841014,0.00041101500028162263,15.79447577249269,2827,5691,2,0,0,0.013347836000320967,6.441799996537156e-05,2,2
-2431244615,360747697,0.025700120997498743,None,2827,5691,2,0,0,0.013347836000320967,6.441799996537156e-05,2,2
-321209230,292484328,0.025627312999858987,None,2827,5691,2,0,0,0.013347836000320967,6.441799996537156e-05,2,2
-4321209902,469718545,0.022171615000843303,515.0475136686434,2827,5691,2,0,0,0.013347836000320967,6.441799996537156e-05,2,2
-4383156580,687130893,0.027555010001378832,850.1534973588364,2827,5691,2,0,0,0.013347836000320967,6.441799996537156e-05,2,2
-7257113602,2614920419,0.0033716799989633728,234.7336669483648,2827,5691,3,0,0,0.029607708998810267,0.00015924499894026667,7,10
-360747540,317839543,0.0001833160022215452,None,2827,5691,3,0,0,0.029607708998810267,0.00015924499894026667,7,10
-475912311,474997358,0.014127130001725163,604.3448574846665,2827,5691,3,0,0,0.029607708998810267,0.00015924499894026667,7,10
-288943151,661183953,0.02109723700050381,690.6292319112416,2827,5691,3,0,0,0.029607708998810267,0.00015924499894026667,7,10
-4475742630,2600670536,0.01875708900115569,608.5541358696867,2827,5691,3,0,0,0.029607708998810267,0.00015924499894026667,7,10
-600852676,317841014,0.0004193280001345556,15.79447577249269,2827,5691,3,0,0,0.029607708998810267,0.00015924499894026667,7,10
-2431244615,360747697,0.026239938000799157,None,2827,5691,3,0,0,0.029607708998810267,0.00015924499894026667,7,10
-321209230,292484328,0.029253147000417812,None,2827,5691,3,0,0,0.029607708998810267,0.00015924499894026667,7,10
-4321209902,469718545,0.021028413000749424,515.0475136686434,2827,5691,3,0,0,0.029607708998810267,0.00015924499894026667,7,10
-4383156580,687130893,0.025430024998058798,850.1534973588364,2827,5691,3,0,0,0.029607708998810267,0.00015924499894026667,7,10
+317839257,365065404,0.021656063003320014,482.3482801266241,2827,5691,1,0,0,0.0001383989983878564,4.2391999159008265e-05,0,0
+4955445807,306636853,0.01203103599982569,483.27295262816904,2827,5691,1,0,0,0.0001383989983878564,4.2391999159008265e-05,0,0
+574465010,2614897354,0.001240549001522595,76.08435116548294,2827,5691,1,0,0,0.0001383989983878564,4.2391999159008265e-05,0,0
+6001542026,7115126884,0.0001965869996638503,None,2827,5691,1,0,0,0.0001383989983878564,4.2391999159008265e-05,0,0
+549922866,2997117854,0.017997906001255615,437.3666210341159,2827,5691,1,0,0,0.0001383989983878564,4.2391999159008265e-05,0,0
+475912312,408478746,0.027259989001322538,1335.1856439163962,2827,5691,1,0,0,0.0001383989983878564,4.2391999159008265e-05,0,0
+2604685993,292725114,0.026585117000649916,None,2827,5691,1,0,0,0.0001383989983878564,4.2391999159008265e-05,0,0
+306639025,2623041440,0.0195082040008856,624.5015845003608,2827,5691,1,0,0,0.0001383989983878564,4.2391999159008265e-05,0,0
+748845491,7202546043,0.007926725997094763,273.68697234782496,2827,5691,1,0,0,0.0001383989983878564,4.2391999159008265e-05,0,0
+1979730425,1934189601,0.0071600760020373855,465.34941712776924,2827,5691,1,0,0,0.0001383989983878564,4.2391999159008265e-05,0,0
+317839257,365065404,0.022521311999298632,482.3482801266241,2827,5691,2,0,0,0.005734129001211841,0.00010572099927230738,4,3
+4955445807,306636853,0.01274889200067264,483.27295262816904,2827,5691,2,0,0,0.005734129001211841,0.00010572099927230738,4,3
+574465010,2614897354,0.001398789001541445,76.08435116548294,2827,5691,2,0,0,0.005734129001211841,0.00010572099927230738,4,3
+6001542026,7115126884,0.0002509400001144968,None,2827,5691,2,0,0,0.005734129001211841,0.00010572099927230738,4,3
+549922866,2997117854,0.0188919820029696,437.3666210341159,2827,5691,2,0,0,0.005734129001211841,0.00010572099927230738,4,3
+475912312,408478746,0.026389689002826344,1335.1856439163962,2827,5691,2,0,0,0.005734129001211841,0.00010572099927230738,4,3
+2604685993,292725114,0.02621714699853328,None,2827,5691,2,0,0,0.005734129001211841,0.00010572099927230738,4,3
+306639025,2623041440,0.01950992199999746,624.5015845003608,2827,5691,2,0,0,0.005734129001211841,0.00010572099927230738,4,3
+748845491,7202546043,0.007912794000731083,273.68697234782496,2827,5691,2,0,0,0.005734129001211841,0.00010572099927230738,4,3
+1979730425,1934189601,0.008381383002415532,465.34941712776924,2827,5691,2,0,0,0.005734129001211841,0.00010572099927230738,4,3
+317839257,365065404,0.021330304000002798,482.3482801266241,2827,5691,3,0,0,0.035351407997950446,0.0001523889986856375,7,10
+4955445807,306636853,0.011769716002163477,483.27295262816904,2827,5691,3,0,0,0.035351407997950446,0.0001523889986856375,7,10
+574465010,2614897354,0.0011241880019952077,76.08435116548294,2827,5691,3,0,0,0.035351407997950446,0.0001523889986856375,7,10
+6001542026,7115126884,0.00019071400311077014,None,2827,5691,3,0,0,0.035351407997950446,0.0001523889986856375,7,10
+549922866,2997117854,0.01817054799903417,437.3666210341159,2827,5691,3,0,0,0.035351407997950446,0.0001523889986856375,7,10
+475912312,408478746,0.026207360002445057,1335.1856439163962,2827,5691,3,0,0,0.035351407997950446,0.0001523889986856375,7,10
+2604685993,292725114,0.0261078700023063,None,2827,5691,3,0,0,0.035351407997950446,0.0001523889986856375,7,10
+306639025,2623041440,0.02267777999804821,624.5015845003608,2827,5691,3,0,0,0.035351407997950446,0.0001523889986856375,7,10
+748845491,7202546043,0.008962703999713995,273.68697234782496,2827,5691,3,0,0,0.035351407997950446,0.0001523889986856375,7,10
+1979730425,1934189601,0.009243979999155272,465.34941712776924,2827,5691,3,0,0,0.035351407997950446,0.0001523889986856375,7,10
--
GitLab