From 5c8852ec1e6bbdc8a29f0aa35360f4581f57abf6 Mon Sep 17 00:00:00 2001
From: "niehues.mark@gmail.com" <niehues.mark@gmail.com>
Date: Mon, 4 May 2020 16:39:05 +0200
Subject: [PATCH] fixes fixes
---
.gitignore | 1 +
evaluation/configs/bigger.yaml | 16 ++
evaluation/{ => lib}/T.py | 0
evaluation/{ => lib}/__init__.py | 0
evaluation/{ => lib}/export.py | 2 +-
evaluation/{ => lib}/queries.py | 2 +-
.../results/bigger/queries/gasstation.csv | 1 +
evaluation/results/example/queries/astar.csv | 200 +++++++++---------
evaluation/results/example/queries/charge.csv | 200 +++++++++---------
.../results/example/queries/classic.csv | 200 +++++++++---------
.../results/example/queries/gasstation.csv | 200 +++++++++---------
evaluation/run.py | 6 +-
evrouting/gasstation/routing.py | 5 +-
evrouting/osm/imports.py | 24 +--
setup.py | 2 +-
tests/osm/test_import.py | 22 ++
16 files changed, 462 insertions(+), 419 deletions(-)
create mode 100644 evaluation/configs/bigger.yaml
rename evaluation/{ => lib}/T.py (100%)
rename evaluation/{ => lib}/__init__.py (100%)
rename evaluation/{ => lib}/export.py (90%)
rename evaluation/{ => lib}/queries.py (99%)
create mode 100644 evaluation/results/bigger/queries/gasstation.csv
create mode 100644 tests/osm/test_import.py
diff --git a/.gitignore b/.gitignore
index 9b904a9..51f76b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ build
dist
*.egg-info
.ipynb_checkpoints
+*.osm
diff --git a/evaluation/configs/bigger.yaml b/evaluation/configs/bigger.yaml
new file mode 100644
index 0000000..9d2ddd5
--- /dev/null
+++ b/evaluation/configs/bigger.yaml
@@ -0,0 +1,16 @@
+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: 1
+setups:
+ - mu_s: 300 # Start and Target Soc
+ mu_t: 0
+ charging_stations: 10 # Max Number of charging Stations to be inserted.
+ capacity: 300 # kWh
+ consumption:
+ type: gasstation
+ consumption_coefficient: 0.5 # kWh/s
diff --git a/evaluation/T.py b/evaluation/lib/T.py
similarity index 100%
rename from evaluation/T.py
rename to evaluation/lib/T.py
diff --git a/evaluation/__init__.py b/evaluation/lib/__init__.py
similarity index 100%
rename from evaluation/__init__.py
rename to evaluation/lib/__init__.py
diff --git a/evaluation/export.py b/evaluation/lib/export.py
similarity index 90%
rename from evaluation/export.py
rename to evaluation/lib/export.py
index 0f49436..d4ef72e 100644
--- a/evaluation/export.py
+++ b/evaluation/lib/export.py
@@ -1,7 +1,7 @@
from typing import TextIO
from dataclasses import asdict, fields
-from evaluation.T import QueryRow
+from lib.T import QueryRow
SEP = ','
diff --git a/evaluation/queries.py b/evaluation/lib/queries.py
similarity index 99%
rename from evaluation/queries.py
rename to evaluation/lib/queries.py
index 469e372..6f05143 100644
--- a/evaluation/queries.py
+++ b/evaluation/lib/queries.py
@@ -11,7 +11,7 @@ from evrouting.graph_tools import (
from evrouting.osm.profiles import car
from evrouting.osm.routing import GasstationAccessFunctions, a_start_heuristic
-from evaluation.T import (
+from lib.T import (
GasstationQueryRow,
ChargeQueryRow,
ClassicQueryRow,
diff --git a/evaluation/results/bigger/queries/gasstation.csv b/evaluation/results/bigger/queries/gasstation.csv
new file mode 100644
index 0000000..e0eab29
--- /dev/null
+++ b/evaluation/results/bigger/queries/gasstation.csv
@@ -0,0 +1 @@
+start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,time_contracted_graph,time_state_graph
diff --git a/evaluation/results/example/queries/astar.csv b/evaluation/results/example/queries/astar.csv
index 4b09260..53aa94a 100644
--- a/evaluation/results/example/queries/astar.csv
+++ b/evaluation/results/example/queries/astar.csv
@@ -1,101 +1,101 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
-574449274,7286181351,0.007244530000207305,194.81357670348197,2827,5691,4
-1830470692,7115183094,0.0037291449998519965,365.0701651885908,2827,5691,4
-1672267516,7286240205,0.012852728000325442,365.4259696245748,2827,5691,4
-2608429637,7030625396,0.0021279939992382424,145.49989157996416,2827,5691,4
-646729136,2604683547,0.003801269999712531,329.1692377041301,2827,5691,4
-1927634037,600861117,0.018113262000042596,653.3670069918289,2827,5691,4
-6448459754,687139213,0.010015463999479834,265.6577928817744,2827,5691,4
-2705157125,563191192,0.00017039100021065678,15.652806802931288,2827,5691,4
-408478762,2608597178,0.008205775000533322,516.9025756105535,2827,5691,4
-5023014975,2729891520,0.00047845500012044795,149.55867942655965,2827,5691,4
-2626137213,2604992645,0.010996431999956258,454.90186553427174,2827,5691,4
-418009805,360747463,0.025557266000760137,None,2827,5691,4
-2618898510,1505052639,0.008816516000479169,286.84951460120965,2827,5691,4
-7158827508,1929118281,0.00848113300071418,267.7730506000322,2827,5691,4
-292485413,1867147172,0.015547871000308078,419.7016162432571,2827,5691,4
-318015069,268979973,0.002222527999947488,127.73244229126664,2827,5691,4
-7286181370,321209223,0.022261187999902177,584.0213980757591,2827,5691,4
-2608597178,2705157127,0.016426825000053213,466.55867829322426,2827,5691,4
-600862363,2608501198,0.02221701300004497,635.0716590812289,2827,5691,4
-1934188821,1828400039,0.02428194000003714,835.4607506525304,2827,5691,4
-2608500961,418009803,0.009991426999476971,337.53501271787036,2827,5691,4
-360747471,360747407,0.026660657000320498,None,2827,5691,4
-677438068,1929118233,0.01690855500055477,422.19689265053086,2827,5691,4
-574588784,2600543671,0.0005301569999573985,35.201949823759065,2827,5691,4
-4016873907,2623041433,0.013542663000407629,396.12785224778844,2827,5691,4
-574505825,549944400,0.003812443000242638,199.78210090744187,2827,5691,4
-2611370483,2608394368,0.007541227999354305,248.24857545894645,2827,5691,4
-1830463045,687139215,0.0006671089995506918,204.23245870150174,2827,5691,4
-4955446064,2598985164,0.01778615399962291,473.8463632950769,2827,5691,4
-748845115,4955446060,0.009072364000530797,442.10631460582454,2827,5691,4
-306636858,1828408218,0.0006649690003541764,81.14322936786671,2827,5691,4
-360747732,4475752956,0.012014001999887114,873.304437475315,2827,5691,4
-2639898823,333265684,0.0019479270004012506,152.6155058467752,2827,5691,4
-1828269090,1934189386,0.0007329299996854388,None,2827,5691,4
-4955446064,7158827520,0.018310268000277574,433.5161478960859,2827,5691,4
-360747697,34053451,0.01929134000056365,1030.163943385966,2827,5691,4
-1828418198,4016874590,0.00014748099965800066,8.310544046719077,2827,5691,4
-1929118261,6943345432,0.0030741860000489396,226.68264809697095,2827,5691,4
-288944218,4955446074,0.0007261010005095159,146.75851962977313,2827,5691,4
-3191239426,360747489,0.0024116080003295792,120.20878164582994,2827,5691,4
-7140339578,574466056,0.014558408999619132,536.310376605903,2827,5691,4
-1672334342,1828269090,0.000303513999824645,None,2827,5691,4
-3462099368,7030626843,0.0022534210002049804,323.20742666960535,2827,5691,4
-563194902,4383156581,0.0014395460002560867,81.0656456093864,2827,5691,4
-2614920419,317841014,0.007590508000248519,343.646988063927,2827,5691,4
-5609333813,4016873925,0.0010476020006535691,137.0727625051702,2827,5691,4
-360747548,4955446073,0.00046362400007637916,None,2827,5691,4
-4016874619,7030602782,0.002930756000750989,121.68675544208482,2827,5691,4
-4929232376,687139214,0.010118010000041977,328.2759130247716,2827,5691,4
-563191181,317767227,0.00480101100038155,374.2933101732441,2827,5691,4
-2614897350,2608429851,0.01212241100074607,380.2359540707999,2827,5691,4
-1828400039,3307706662,0.023569981000036933,856.824142783833,2827,5691,4
-600861113,3273201483,0.0025922129998434684,353.9040093658782,2827,5691,4
-360747468,2709164479,0.006778728999961459,245.74095622933788,2827,5691,4
-294919113,360747793,0.025041631999556557,None,2827,5691,4
-2604949484,430534360,0.022151607000523654,531.444063767383,2827,5691,4
-474997017,2598988012,0.003749925999727566,224.84622715583626,2827,5691,4
-90713490,574727048,0.0002176550005970057,None,2827,5691,4
-4955446060,317958831,0.0023372580008071964,253.1386779169229,2827,5691,4
-1768859055,45217541,0.0022630379999100114,369.37797748545194,2827,5691,4
-2604992659,6448462029,0.004515603000072588,330.9659384616292,2827,5691,4
-2619060546,7140339572,0.018461535999449552,534.3572520800851,2827,5691,4
-3668786925,2634485441,0.0017088060003516148,87.54956980452867,2827,5691,4
-574475517,2973923285,0.018262130999573856,479.8360902158978,2827,5691,4
-2598868374,665115011,0.012274554000214266,454.0896767954179,2827,5691,4
-5113940072,2611370483,0.01438836600027571,506.69207730498493,2827,5691,4
-1929118226,306636860,0.002952249999907508,481.1279796611201,2827,5691,4
-426948333,4383156580,0.010366024999711954,632.4592732803192,2827,5691,4
-7030617897,2634485459,0.002415456000562699,146.1957070244722,2827,5691,4
-2729891690,7321902563,0.004666603000259784,373.0782873038615,2827,5691,4
-418009801,5609333814,0.010439554999720713,384.5693052272371,2827,5691,4
-45217462,7030602777,0.0037208510002528783,198.85245885438133,2827,5691,4
-7322098548,90713487,0.0073054190006587305,240.92212818527582,2827,5691,4
-1929118240,2617662105,0.0009911890001603751,347.67919068459423,2827,5691,4
-1929118302,7030617896,0.007518567999795778,418.0060975157141,2827,5691,4
-288943155,2705157131,0.0072621700001036515,423.6989363258847,2827,5691,4
-6448462030,5113940036,0.023298070000237203,628.443821622615,2827,5691,4
-6448459778,473666786,0.022917225000128383,552.761982386143,2827,5691,4
-306636856,1199554350,0.001594234000549477,147.70987970142252,2827,5691,4
-3376536295,4903549431,0.0029419940001389477,236.41437406265553,2827,5691,4
-7140363810,7182110437,0.014094901000134996,506.6812140226577,2827,5691,4
-430536880,1618977288,0.021858088000044518,702.3366532415276,2827,5691,4
-2604684729,408478826,0.010610469999846828,387.9706827162471,2827,5691,4
-1672267779,7042580417,0.00024617800045234617,None,2827,5691,4
-7321902568,321209231,0.015578853999613784,463.1345950736491,2827,5691,4
-7042580411,549947350,0.003623890000199026,595.6450427142878,2827,5691,4
-2335713723,6389441585,0.0011841410005217767,97.70926013331479,2827,5691,4
-7286135546,3273193623,0.0016340120000677416,90.18525327898215,2827,5691,4
-469720334,2385218587,0.014769893000448064,710.5952929463489,2827,5691,4
-2611494654,17689721,0.00808964800035028,292.34574833206705,2827,5691,4
-3123285425,418009264,0.017382225999426737,413.37339509309425,2827,5691,4
-17689726,1756155427,0.00010261700026603648,None,2827,5691,4
-5095519272,7158827515,0.014702512999974715,425.50618767906104,2827,5691,4
-7321902571,473666768,0.022622257999501016,597.809710233175,2827,5691,4
-574465013,665115011,0.011290923999695224,364.7229266193342,2827,5691,4
-317840789,288946075,0.010630052999658801,336.3806379659176,2827,5691,4
-288944217,474997356,0.01630163200024981,574.6411234434853,2827,5691,4
-45217522,34053439,0.004241646999616933,120.5084189052182,2827,5691,4
-17689721,1937178491,0.0005835790007040487,None,2827,5691,4
-1934201756,1927634129,0.010097956999743474,606.6502915340575,2827,5691,4
+317839015,2608597414,0.0029104290006216615,134.20641775784284,2827,5691,4
+600866936,574459683,0.00043411300066509284,42.73345795958952,2827,5691,4
+1828400048,318014988,0.007824992000678321,608.8154151891008,2827,5691,4
+1821291294,1253890891,0.003377693999937037,146.42601273567817,2827,5691,4
+306636860,574546129,0.017317222998826765,480.5650193392354,2827,5691,4
+1828269031,1293287346,0.00013950399988971185,None,2827,5691,4
+7246644043,1785834373,0.009470737000810914,666.9803259731362,2827,5691,4
+317767414,4903549431,0.0017464470001868904,114.46003909259218,2827,5691,4
+7286135580,1768859058,0.011583373001485597,395.84248183992185,2827,5691,4
+4955445805,408478816,0.011424405998695875,567.4848259231705,2827,5691,4
+1574635374,674511693,0.021547543999986374,550.0748943362573,2827,5691,4
+574588784,408478820,0.0053697870007454185,264.35687307965287,2827,5691,4
+2608393065,1672267530,0.02534151399959228,None,2827,5691,4
+475912313,316681910,0.004388879000543966,942.1180230345709,2827,5691,4
+408478785,408478782,0.00015359399912995286,34.41546978302828,2827,5691,4
+6819437344,7030617904,0.019174284001564956,481.9151236333546,2827,5691,4
+5576939246,426930264,0.009820298000704497,404.8320487549189,2827,5691,4
+3462099368,6448461993,0.003160067999488092,336.8403336906005,2827,5691,4
+2611491719,7322098539,0.005497967000337667,127.20440767277066,2827,5691,4
+317766814,3211622700,0.00994299800004228,257.39751855926295,2827,5691,4
+3211622691,317841016,0.0034796480013028486,228.31392020003418,2827,5691,4
+1672267793,2639898842,0.000162070000442327,None,2827,5691,4
+687139205,473666781,0.027668359000017517,798.4822164089193,2827,5691,4
+317944964,7074500840,0.02371494600083679,595.4046228774345,2827,5691,4
+6001542006,6448462033,0.004156434999458725,239.60236102067614,2827,5691,4
+2621386740,3307706689,0.015254337999067502,602.6995574419633,2827,5691,4
+1368670343,1988057398,0.0005992970000079367,None,2827,5691,4
+318015014,1827520766,0.0009820260002015857,133.73064158397338,2827,5691,4
+418009256,1828418234,0.0032158549984160345,372.47673656312475,2827,5691,4
+7286135545,1505992832,0.008901938001145027,333.42180486451286,2827,5691,4
+574588773,2628942175,0.013364581000132603,467.7994039103217,2827,5691,4
+7286135582,574457822,0.011937180999666452,417.91642968790643,2827,5691,4
+574465017,306639015,0.02464433299974189,647.0098682163824,2827,5691,4
+3211622686,469733511,0.01584500900025887,438.215885183934,2827,5691,4
+3299068955,292484330,0.02607109299970034,None,2827,5691,4
+6389441585,2621462848,0.012052291000145487,345.8873681392482,2827,5691,4
+6448462005,574465004,0.01198793200092041,365.66170716426467,2827,5691,4
+563191209,2598868374,0.008100971999738249,459.08935453166885,2827,5691,4
+474997349,574475518,0.004600943000696134,302.900774775551,2827,5691,4
+5023014978,1828254500,0.01187936099995568,613.4664202293044,2827,5691,4
+1975596505,574727042,0.0005899029983993387,None,2827,5691,4
+748845497,7321975008,0.010433752000608365,391.74819594588735,2827,5691,4
+2608428534,1672334330,0.025211374999344116,None,2827,5691,4
+408478758,7207579521,0.0025278209996031364,411.93141465296424,2827,5691,4
+4955446060,6448462007,0.0029238320003059926,262.0362444929049,2827,5691,4
+3522260318,306636859,0.0034901730014098575,159.09788624831754,2827,5691,4
+317944963,7115183097,0.0016544549998798175,67.58201327566792,2827,5691,4
+1672334393,7140339574,0.00017444699915358797,None,2827,5691,4
+1505052639,321209231,0.0012738770001305966,110.67991376476547,2827,5691,4
+6603016875,574466058,0.01655158500034304,801.7275688850564,2827,5691,4
+360747888,1362941669,0.004519658999925014,390.19244662333114,2827,5691,4
+665115010,7140339575,0.008815920999040827,230.1918558703617,2827,5691,4
+2600543766,2608678959,0.008440437000899692,357.32480845699075,2827,5691,4
+2608429635,473666764,0.020331685000201105,508.8591038499049,2827,5691,4
+306636859,1828254502,0.00989703099912731,314.00106339887475,2827,5691,4
+360747406,574470577,0.0005679890000465093,None,2827,5691,4
+317838699,600858466,0.00703630099997099,243.3738181224468,2827,5691,4
+7286135500,549931423,0.009580997999364627,347.69665268511926,2827,5691,4
+1827499344,563194931,0.01688800500051002,486.4783004817786,2827,5691,4
+7321902568,2701786783,0.013925896000728244,413.4167974494645,2827,5691,4
+1672267673,2608428514,0.00010038700020231772,None,2827,5691,4
+2617662111,418009261,0.021948257999611087,542.7127650614764,2827,5691,4
+316681913,549920915,0.004847648999202647,209.40704035959422,2827,5691,4
+3111465600,306636854,0.006741399998645647,284.8839743555975,2827,5691,4
+1362941681,1828418208,0.0004823789986403426,38.08279832815822,2827,5691,4
+687135582,1929118326,0.011647650999293546,422.5319993114704,2827,5691,4
+4016874588,45217432,0.0031295749995479127,162.7814542661217,2827,5691,4
+1672267848,1362941670,0.0034593969994602958,197.42807498913555,2827,5691,4
+2608597329,2608597414,0.00019262900059402455,24.250914290851785,2827,5691,4
+473666779,4016874420,0.013054766999630374,662.0691548354674,2827,5691,4
+292484326,5609334125,0.007277725000676583,246.8784762493996,2827,5691,4
+1828277191,408478761,0.019910580000214395,511.74173668766315,2827,5691,4
+549931436,317839832,0.006890299999213312,290.01162457737996,2827,5691,4
+574459687,358407314,0.00029880199872422963,26.4283022332109,2827,5691,4
+1827268628,4016873481,0.00464572899909399,342.2073375224712,2827,5691,4
+1505057722,360757808,0.004789683000126388,310.3364405891029,2827,5691,4
+1956302545,1829747762,0.01344533399969805,983.4639697397456,2827,5691,4
+408478744,1827520758,0.00937184999929741,907.8637028422908,2827,5691,4
+1505052444,7286240207,0.02007288200002222,583.6255399147286,2827,5691,4
+3123285393,4016874420,0.004918950000501354,110.1168946479104,2827,5691,4
+1756155427,474997347,0.009915163000187022,366.0420378552742,2827,5691,4
+1821186334,793260945,0.005998712000291562,624.7792861275356,2827,5691,4
+7321902573,408478786,0.01817210800072644,457.6392812766023,2827,5691,4
+2616315927,2632841183,0.00829988299847173,350.1883124819374,2827,5691,4
+1253880620,1672267779,0.0026185889983025845,252.99978531798945,2827,5691,4
+418009800,1929118187,0.023934550999911153,751.0177733056021,2827,5691,4
+6417387131,2608393065,0.007754965999993146,338.9348445433285,2827,5691,4
+2608501857,360747431,0.0030530200001521735,254.55517532312925,2827,5691,4
+2604685993,1929118225,0.020593543998984387,549.0222840409713,2827,5691,4
+1609256705,4226442917,0.0006582569985766895,129.99971083575585,2827,5691,4
+440870188,1821291310,0.02006210400031705,623.262611050659,2827,5691,4
+6448462031,574546129,0.01869943699966825,489.9704653435302,2827,5691,4
+1830468180,426930261,0.016743643000154407,584.737718785695,2827,5691,4
+574546136,1960033968,0.018022440999629907,606.7570010182741,2827,5691,4
+288947635,318014980,0.004075388000273961,188.5411256908574,2827,5691,4
+2634485437,426930258,0.01378776999990805,468.55534135619905,2827,5691,4
+2385218592,1293287346,0.0010928949996014126,205.6821289013954,2827,5691,4
+292724874,6448462002,0.0028984540003875736,199.39809308575832,2827,5691,4
+2700898238,1867147170,0.022008742000252823,619.2286054124086,2827,5691,4
+2598987665,2608394482,0.011225992000618135,356.5664036847147,2827,5691,4
diff --git a/evaluation/results/example/queries/charge.csv b/evaluation/results/example/queries/charge.csv
index a27956f..a7e5621 100644
--- a/evaluation/results/example/queries/charge.csv
+++ b/evaluation/results/example/queries/charge.csv
@@ -1,101 +1,101 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
-574449274,7286181351,0.08593619800012675,None,2828,5691,4
-1830470692,7115183094,0.00765740899987577,None,2827,5691,4
-1672267516,7286240205,0.0046115260001897695,None,2828,5691,4
-2608429637,7030625396,0.013127250999787066,None,2827,5691,4
-646729136,2604683547,0.00497466699926008,None,2828,5691,4
-1927634037,600861117,0.033602525999413047,None,2827,5691,4
-6448459754,687139213,0.05243231499935064,None,2828,5691,4
-2705157125,563191192,0.0051163930002076086,15.652806802931288,2827,5691,4
-408478762,2608597178,0.005640194999614323,None,2828,5691,4
-5023014975,2729891520,0.005571219999183086,None,2827,5691,4
-2626137213,2604992645,0.013914183000451885,None,2828,5691,4
-418009805,360747463,0.032114452000314486,None,2827,5691,4
-2618898510,1505052639,0.012225428000419925,None,2828,5691,4
-7158827508,1929118281,0.025428179000300588,None,2827,5691,4
-292485413,1867147172,0.010187334999500308,None,2828,5691,4
-318015069,268979973,0.012232138000399573,None,2827,5691,4
-7286181370,321209223,0.04919259400048759,None,2828,5691,4
-2608597178,2705157127,0.011482728000373754,None,2827,5691,4
-600862363,2608501198,0.004978752000170061,None,2828,5691,4
-1934188821,1828400039,0.006894655999531096,None,2827,5691,4
-2608500961,418009803,0.011830726999505714,None,2828,5691,4
-360747471,360747407,0.013290030999996816,None,2827,5691,4
-677438068,1929118233,0.030689236000398523,None,2828,5691,4
-574588784,2600543671,0.008700227000190353,35.201949823759065,2827,5691,4
-4016873907,2623041433,0.01361600299969723,None,2828,5691,4
-574505825,549944400,0.014139515999886498,None,2827,5691,4
-2611370483,2608394368,0.012290613000004669,None,2828,5691,4
-1830463045,687139215,0.031173609999314067,None,2827,5691,4
-4955446064,2598985164,0.010806756000420137,None,2828,5691,4
-748845115,4955446060,0.0053240240004015504,None,2827,5691,4
-306636858,1828408218,0.012851230999331165,None,2828,5691,4
-360747732,4475752956,0.005567711999901803,None,2827,5691,4
-2639898823,333265684,0.012068131999512843,None,2828,5691,4
-1828269090,1934189386,0.03118294099931518,None,2827,5691,4
-4955446064,7158827520,0.011034157999347372,None,2828,5691,4
-360747697,34053451,0.00555283599987888,None,2827,5691,4
-1828418198,4016874590,0.005437205999442085,8.310544046719077,2828,5691,4
-1929118261,6943345432,0.0075050380000902805,None,2827,5691,4
-288944218,4955446074,0.007186824000200431,None,2828,5691,4
-3191239426,360747489,0.04765999000028387,None,2827,5691,4
-7140339578,574466056,0.005421976999969047,None,2828,5691,4
-1672334342,1828269090,0.004812822000531014,None,2827,5691,4
-3462099368,7030626843,0.00686892599969724,None,2828,5691,4
-563194902,4383156581,0.014890090999870154,None,2827,5691,4
-2614920419,317841014,0.04798837100042874,None,2828,5691,4
-5609333813,4016873925,0.014463810000052035,None,2827,5691,4
-360747548,4955446073,0.005759970000326575,None,2828,5691,4
-4016874619,7030602782,0.018400271000245993,121.68675544208482,2827,5691,4
-4929232376,687139214,0.013457410999762942,None,2828,5691,4
-563191181,317767227,0.03352561999963655,None,2827,5691,4
-2614897350,2608429851,0.02435055200021452,None,2828,5691,4
-1828400039,3307706662,0.00637481099965953,None,2827,5691,4
-600861113,3273201483,0.006827528000030725,None,2828,5691,4
-360747468,2709164479,0.013690073999896413,None,2827,5691,4
-294919113,360747793,0.008435933000328077,None,2828,5691,4
-2604949484,430534360,0.03727748800065456,None,2827,5691,4
-474997017,2598988012,0.008490320999953838,None,2828,5691,4
-90713490,574727048,0.004952035999849613,None,2827,5691,4
-4955446060,317958831,0.006151688000500144,None,2828,5691,4
-1768859055,45217541,0.007079666999743495,None,2827,5691,4
-2604992659,6448462029,0.006963455999539292,None,2828,5691,4
-2619060546,7140339572,0.036078169000575144,None,2827,5691,4
-3668786925,2634485441,0.027613982000730175,100.05486514333441,2828,5691,4
-574475517,2973923285,0.021921657999882882,None,2827,5691,4
-2598868374,665115011,0.011879695000061474,None,2828,5691,4
-5113940072,2611370483,0.008804813000097056,None,2827,5691,4
-1929118226,306636860,0.03466573100013193,None,2828,5691,4
-426948333,4383156580,0.004811731999325275,None,2827,5691,4
-7030617897,2634485459,0.015809116000127688,None,2828,5691,4
-2729891690,7321902563,0.006943249999494583,None,2827,5691,4
-418009801,5609333814,0.00742467000054603,None,2828,5691,4
-45217462,7030602777,0.014405375000023923,None,2827,5691,4
-7322098548,90713487,0.04046376499991311,None,2828,5691,4
-1929118240,2617662105,0.008858984000653436,None,2827,5691,4
-1929118302,7030617896,0.007767093000438763,None,2828,5691,4
-288943155,2705157131,0.007660367999960727,None,2827,5691,4
-6448462030,5113940036,0.013072276999992027,None,2828,5691,4
-6448459778,473666786,0.0865379650003888,None,2827,5691,4
-306636856,1199554350,0.007357987000432331,None,2828,5691,4
-3376536295,4903549431,0.014785829000175,None,2827,5691,4
-7140363810,7182110437,0.006760963000488118,None,2828,5691,4
-430536880,1618977288,0.006050967000192031,None,2827,5691,4
-2604684729,408478826,0.036886166999465786,None,2828,5691,4
-1672267779,7042580417,0.004902184000457055,None,2827,5691,4
-7321902568,321209231,0.061450432000128785,None,2828,5691,4
-7042580411,549947350,0.004822902999876533,None,2827,5691,4
-2335713723,6389441585,0.006925313000465394,None,2828,5691,4
-7286135546,3273193623,0.012095413999304583,None,2827,5691,4
-469720334,2385218587,0.031542064999484865,None,2828,5691,4
-2611494654,17689721,0.006321780000689614,None,2827,5691,4
-3123285425,418009264,0.007023025999842503,None,2828,5691,4
-17689726,1756155427,0.004588992000208236,None,2827,5691,4
-5095519272,7158827515,0.007595263000439445,None,2828,5691,4
-7321902571,473666768,0.08791076299985434,None,2827,5691,4
-574465013,665115011,0.012744218999614532,None,2828,5691,4
-317840789,288946075,0.05369692099975509,None,2827,5691,4
-288944217,474997356,0.00786934299958375,None,2828,5691,4
-45217522,34053439,0.06782727299923863,None,2827,5691,4
-17689721,1937178491,0.004479252999772143,None,2828,5691,4
-1934201756,1927634129,0.030007266999746207,None,2827,5691,4
+317839015,2608597414,0.013800273000015295,None,2828,5691,4
+600866936,574459683,0.008327915998961544,42.73345795958952,2827,5691,4
+1828400048,318014988,0.006055695999748423,None,2828,5691,4
+1821291294,1253890891,0.01068626100095571,None,2827,5691,4
+306636860,574546129,0.01083790700067766,None,2828,5691,4
+1828269031,1293287346,0.030692228001498734,None,2827,5691,4
+7246644043,1785834373,0.0069127890001254855,None,2828,5691,4
+317767414,4903549431,0.0109441490003519,None,2827,5691,4
+7286135580,1768859058,0.019827193000310217,None,2828,5691,4
+4955445805,408478816,0.0059461769997142255,None,2827,5691,4
+1574635374,674511693,0.031631046998882084,None,2828,5691,4
+574588784,408478820,0.013579983000454376,None,2827,5691,4
+2608393065,1672267530,0.006907415001478512,None,2828,5691,4
+475912313,316681910,0.004960342001140816,None,2827,5691,4
+408478785,408478782,0.0051280590014357585,34.41546978302828,2828,5691,4
+6819437344,7030617904,0.021456803999171825,None,2827,5691,4
+5576939246,426930264,0.04242208399955416,None,2828,5691,4
+3462099368,6448461993,0.006827936000263435,None,2827,5691,4
+2611491719,7322098539,0.0610797850004019,None,2828,5691,4
+317766814,3211622700,0.06635948899929645,None,2827,5691,4
+3211622691,317841016,0.015540974000032293,None,2828,5691,4
+1672267793,2639898842,0.0315303129991662,None,2827,5691,4
+687139205,473666781,0.006756841001333669,None,2828,5691,4
+317944964,7074500840,0.013029228000959847,None,2827,5691,4
+6001542006,6448462033,0.007106941000529332,None,2828,5691,4
+2621386740,3307706689,0.007041523000225425,None,2827,5691,4
+1368670343,1988057398,0.004322482000134187,None,2828,5691,4
+318015014,1827520766,0.03566312499970081,None,2827,5691,4
+418009256,1828418234,0.007337261000429862,None,2828,5691,4
+7286135545,1505992832,0.011847763998957817,None,2827,5691,4
+574588773,2628942175,0.01443385099992156,None,2828,5691,4
+7286135582,574457822,0.01826303499910864,None,2827,5691,4
+574465017,306639015,0.05099492199951783,None,2828,5691,4
+3211622686,469733511,0.010153594999792404,None,2827,5691,4
+3299068955,292484330,0.005310430000463384,None,2828,5691,4
+6389441585,2621462848,0.012045089999446645,None,2827,5691,4
+6448462005,574465004,0.07179857299888681,None,2828,5691,4
+563191209,2598868374,0.006334955000056652,None,2827,5691,4
+474997349,574475518,0.03308497500074736,None,2828,5691,4
+5023014978,1828254500,0.0061611740002263105,None,2827,5691,4
+1975596505,574727042,0.004348459000539151,None,2828,5691,4
+748845497,7321975008,0.005460414000481251,None,2827,5691,4
+2608428534,1672334330,0.05488417299966386,None,2828,5691,4
+408478758,7207579521,0.03068466299919237,None,2827,5691,4
+4955446060,6448462007,0.006024951000654255,None,2828,5691,4
+3522260318,306636859,0.005862525000338792,None,2827,5691,4
+317944963,7115183097,0.016315798999130493,None,2828,5691,4
+1672334393,7140339574,0.004457586999706109,None,2827,5691,4
+1505052639,321209231,0.00826678500015987,None,2828,5691,4
+6603016875,574466058,0.032388867999543436,None,2827,5691,4
+360747888,1362941669,0.0044271019996813266,None,2828,5691,4
+665115010,7140339575,0.058596459999535,None,2827,5691,4
+2600543766,2608678959,0.012245870999322506,None,2828,5691,4
+2608429635,473666764,0.012951803999385447,None,2827,5691,4
+306636859,1828254502,0.036064444999283296,None,2828,5691,4
+360747406,574470577,0.0043477789986354765,None,2827,5691,4
+317838699,600858466,0.013017728999329847,None,2828,5691,4
+7286135500,549931423,0.010359599998992053,None,2827,5691,4
+1827499344,563194931,0.008308139998916886,None,2828,5691,4
+7321902568,2701786783,0.06091081100021256,None,2827,5691,4
+1672267673,2608428514,0.030501867999191745,None,2828,5691,4
+2617662111,418009261,0.009338640998976189,None,2827,5691,4
+316681913,549920915,0.011770611999963876,None,2828,5691,4
+3111465600,306636854,0.016085985000245273,None,2827,5691,4
+1362941681,1828418208,0.008232885000325041,38.08279832815822,2828,5691,4
+687135582,1929118326,0.03459181700054614,None,2827,5691,4
+4016874588,45217432,0.06238213899996481,None,2828,5691,4
+1672267848,1362941670,0.01009042599980603,None,2827,5691,4
+2608597329,2608597414,0.0056037140002445085,24.250914290851785,2828,5691,4
+473666779,4016874420,0.008009826000488829,None,2827,5691,4
+292484326,5609334125,0.04146211400075117,None,2828,5691,4
+1828277191,408478761,0.009702532999654068,None,2827,5691,4
+549931436,317839832,0.012786319999577245,None,2828,5691,4
+574459687,358407314,0.006585152999832644,26.4283022332109,2827,5691,4
+1827268628,4016873481,0.005216947000008076,None,2828,5691,4
+1505057722,360757808,0.006531336999614723,None,2827,5691,4
+1956302545,1829747762,0.03223330800028634,None,2828,5691,4
+408478744,1827520758,0.004412433001562022,None,2827,5691,4
+1505052444,7286240207,0.005023095998694771,None,2828,5691,4
+3123285393,4016874420,0.04451340300147422,110.1168946479104,2827,5691,4
+1756155427,474997347,0.013192834001529263,None,2828,5691,4
+1821186334,793260945,0.03359696799998346,None,2827,5691,4
+7321902573,408478786,0.06091273899983207,None,2828,5691,4
+2616315927,2632841183,0.017812361000324017,None,2827,5691,4
+1253880620,1672267779,0.005767987000581343,None,2828,5691,4
+418009800,1929118187,0.006906126000103541,None,2827,5691,4
+6417387131,2608393065,0.013187538999773096,None,2828,5691,4
+2608501857,360747431,0.03234585800055356,None,2827,5691,4
+2604685993,1929118225,0.010358940999140032,None,2828,5691,4
+1609256705,4226442917,0.005768687999079702,None,2827,5691,4
+440870188,1821291310,0.007508905000577215,None,2828,5691,4
+6448462031,574546129,0.013000194001506316,None,2827,5691,4
+1830468180,426930261,0.03292253899962816,None,2828,5691,4
+574546136,1960033968,0.015110457999981008,None,2827,5691,4
+288947635,318014980,0.012099874000341515,None,2828,5691,4
+2634485437,426930258,0.005317040000591078,None,2827,5691,4
+2385218592,1293287346,0.00833478999993531,None,2828,5691,4
+292724874,6448462002,0.00899214099990786,None,2827,5691,4
+2700898238,1867147170,0.03415657900040969,None,2828,5691,4
+2598987665,2608394482,0.022381692000635667,None,2827,5691,4
diff --git a/evaluation/results/example/queries/classic.csv b/evaluation/results/example/queries/classic.csv
index 2919d6d..6c105d2 100644
--- a/evaluation/results/example/queries/classic.csv
+++ b/evaluation/results/example/queries/classic.csv
@@ -1,101 +1,101 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,dijkstra_rank
-574449274,7286181351,0.002132000000528933,194.81357670348197,2827,5691,4,0
-1830470692,7115183094,0.001059727999745519,365.0701651885908,2827,5691,4,0
-1672267516,7286240205,0.004697794000094291,365.4259696245748,2827,5691,4,0
-2608429637,7030625396,0.0013560240004153457,145.49989157996416,2827,5691,4,0
-646729136,2604683547,0.0021940370006632293,329.1692377041301,2827,5691,4,0
-1927634037,600861117,0.005441782000161766,653.3670069918289,2827,5691,4,0
-6448459754,687139213,0.0030470339997918927,265.6577928817744,2827,5691,4,0
-2705157125,563191192,3.177300004608696e-05,15.652806802931288,2827,5691,4,0
-408478762,2608597178,0.003333872999974119,516.9025756105535,2827,5691,4,0
-5023014975,2729891520,0.00011267999980191234,149.55867942655965,2827,5691,4,0
-2626137213,2604992645,0.002932804999545624,454.90186553427174,2827,5691,4,0
-418009805,360747463,0.005694706000213046,None,2827,5691,4,0
-2618898510,1505052639,0.0034874020002462203,286.84951460120965,2827,5691,4,0
-7158827508,1929118281,0.0024861950005288236,267.7730506000322,2827,5691,4,0
-292485413,1867147172,0.004668266999942716,419.7016162432571,2827,5691,4,0
-318015069,268979973,0.0007367820007857517,127.73244229126664,2827,5691,4,0
-7286181370,321209223,0.005551819999709551,584.0213980757591,2827,5691,4,0
-2608597178,2705157127,0.0044703909998133895,466.55867829322426,2827,5691,4,0
-600862363,2608501198,0.004721174000223982,635.0716590812289,2827,5691,4,0
-1934188821,1828400039,0.005495439999322116,835.4607506525304,2827,5691,4,0
-2608500961,418009803,0.0026901510000243434,337.53501271787036,2827,5691,4,0
-360747471,360747407,0.005887925999559229,None,2827,5691,4,0
-677438068,1929118233,0.005440525999802048,422.19689265053086,2827,5691,4,0
-574588784,2600543671,0.0001726849995975499,35.201949823759065,2827,5691,4,0
-4016873907,2623041433,0.00437952900028904,396.12785224778844,2827,5691,4,0
-574505825,549944400,0.000982375000603497,199.78210090744187,2827,5691,4,0
-2611370483,2608394368,0.002090531999783707,248.24857545894645,2827,5691,4,0
-1830463045,687139215,0.0001545430004625814,204.23245870150174,2827,5691,4,0
-4955446064,2598985164,0.005155176000698702,473.8463632950769,2827,5691,4,0
-748845115,4955446060,0.002635769999869808,442.10631460582454,2827,5691,4,0
-306636858,1828408218,0.00023694399988016812,81.14322936786671,2827,5691,4,0
-360747732,4475752956,0.004541976000837167,873.304437475315,2827,5691,4,0
-2639898823,333265684,0.0006542840001202421,152.6155058467752,2827,5691,4,0
-1828269090,1934189386,0.0001281889999518171,None,2827,5691,4,0
-4955446064,7158827520,0.004658738999751222,433.5161478960859,2827,5691,4,0
-360747697,34053451,0.005695388999811257,1030.163943385966,2827,5691,4,0
-1828418198,4016874590,4.4644000809057616e-05,8.310544046719077,2827,5691,4,0
-1929118261,6943345432,0.0016043639998315484,226.68264809697095,2827,5691,4,0
-288944218,4955446074,0.00023508399954152992,146.75851962977313,2827,5691,4,0
-3191239426,360747489,0.0010205219996350934,120.20878164582994,2827,5691,4,0
-7140339578,574466056,0.0041382330000487855,536.310376605903,2827,5691,4,0
-1672334342,1828269090,6.561999998666579e-05,None,2827,5691,4,0
-3462099368,7030626843,0.0009524540000711568,323.20742666960535,2827,5691,4,0
-563194902,4383156581,0.0006674899996141903,81.0656456093864,2827,5691,4,0
-2614920419,317841014,0.002951030000076571,343.646988063927,2827,5691,4,0
-5609333813,4016873925,0.0003030119996765279,137.0727625051702,2827,5691,4,0
-360747548,4955446073,8.350400003109826e-05,None,2827,5691,4,0
-4016874619,7030602782,0.0008770009999352624,121.68675544208482,2827,5691,4,0
-4929232376,687139214,0.002810863999911817,328.2759130247716,2827,5691,4,0
-563191181,317767227,0.002074660000289441,374.2933101732441,2827,5691,4,0
-2614897350,2608429851,0.0036189310003464925,380.2359540707999,2827,5691,4,0
-1828400039,3307706662,0.0060952080002607545,856.824142783833,2827,5691,4,0
-600861113,3273201483,0.0009470679997320985,353.9040093658782,2827,5691,4,0
-360747468,2709164479,0.0030611800002589007,245.74095622933788,2827,5691,4,0
-294919113,360747793,0.005909673999667575,None,2827,5691,4,0
-2604949484,430534360,0.005629332000353315,531.444063767383,2827,5691,4,0
-474997017,2598988012,0.0013550579997172463,224.84622715583626,2827,5691,4,0
-90713490,574727048,5.091399998491397e-05,None,2827,5691,4,0
-4955446060,317958831,0.0008191729993995978,253.1386779169229,2827,5691,4,0
-1768859055,45217541,0.000595557000451663,369.37797748545194,2827,5691,4,0
-2604992659,6448462029,0.002697282000553969,330.9659384616292,2827,5691,4,0
-2619060546,7140339572,0.005117643000630778,534.3572520800851,2827,5691,4,0
-3668786925,2634485441,0.0005062899999757065,87.54956980452867,2827,5691,4,0
-574475517,2973923285,0.004969312999492104,479.8360902158978,2827,5691,4,0
-2598868374,665115011,0.003255554999668675,454.0896767954179,2827,5691,4,0
-5113940072,2611370483,0.004374828999971214,506.69207730498493,2827,5691,4,0
-1929118226,306636860,0.001400148999891826,481.1279796611201,2827,5691,4,0
-426948333,4383156580,0.005427146999863908,632.4592732803192,2827,5691,4,0
-7030617897,2634485459,0.001061169999957201,146.1957070244722,2827,5691,4,0
-2729891690,7321902563,0.0016252369996436755,373.0782873038615,2827,5691,4,0
-418009801,5609333814,0.004048009000143793,384.5693052272371,2827,5691,4,0
-45217462,7030602777,0.0022971919997871737,198.85245885438133,2827,5691,4,0
-7322098548,90713487,0.0024017229998207767,240.92212818527582,2827,5691,4,0
-1929118240,2617662105,0.0003293630006737658,347.67919068459423,2827,5691,4,0
-1929118302,7030617896,0.003332670999952825,418.0060975157141,2827,5691,4,0
-288943155,2705157131,0.0028380519997881493,423.6989363258847,2827,5691,4,0
-6448462030,5113940036,0.006904796000526403,628.443821622615,2827,5691,4,0
-6448459778,473666786,0.0060929020000912715,552.761982386143,2827,5691,4,0
-306636856,1199554350,0.0005567349999182625,147.70987970142252,2827,5691,4,0
-3376536295,4903549431,0.0009456130001126439,236.41437406265553,2827,5691,4,0
-7140363810,7182110437,0.005062401000031969,506.6812140226577,2827,5691,4,0
-430536880,1618977288,0.0055735649993948755,702.3366532415276,2827,5691,4,0
-2604684729,408478826,0.004554826999992656,387.9706827162471,2827,5691,4,0
-1672267779,7042580417,5.5530000281578396e-05,None,2827,5691,4,0
-7321902568,321209231,0.004548589000478387,463.1345950736491,2827,5691,4,0
-7042580411,549947350,0.001493896000283712,595.6450427142878,2827,5691,4,0
-2335713723,6389441585,0.00035079100052826107,97.70926013331479,2827,5691,4,0
-7286135546,3273193623,0.00039949099937075516,90.18525327898215,2827,5691,4,0
-469720334,2385218587,0.003727649000211386,710.5952929463489,2827,5691,4,0
-2611494654,17689721,0.0026275109994458035,292.34574833206705,2827,5691,4,0
-3123285425,418009264,0.0053733619997728965,413.37339509309425,2827,5691,4,0
-17689726,1756155427,3.124000068055466e-05,None,2827,5691,4,0
-5095519272,7158827515,0.003978052999627835,425.50618767906104,2827,5691,4,0
-7321902571,473666768,0.005549919999793929,597.809710233175,2827,5691,4,0
-574465013,665115011,0.003740268000001379,364.7229266193342,2827,5691,4,0
-317840789,288946075,0.003132486999675166,336.3806379659176,2827,5691,4,0
-288944217,474997356,0.004560741000204871,574.6411234434853,2827,5691,4,0
-45217522,34053439,0.0015629919998900732,120.5084189052182,2827,5691,4,0
-17689721,1937178491,0.00010327900054107886,None,2827,5691,4,0
-1934201756,1927634129,0.002730947000600281,606.6502915340575,2827,5691,4,0
+317839015,2608597414,0.0009618260010029189,134.20641775784284,2827,5691,4,0
+600866936,574459683,0.0001631340001040371,42.73345795958952,2827,5691,4,0
+1828400048,318014988,0.002689340999495471,608.8154151891008,2827,5691,4,0
+1821291294,1253890891,0.0014391839995369082,146.42601273567817,2827,5691,4,0
+306636860,574546129,0.005149478998646373,480.5650193392354,2827,5691,4,0
+1828269031,1293287346,3.966399890487082e-05,None,2827,5691,4,0
+7246644043,1785834373,0.0034015040000667796,666.9803259731362,2827,5691,4,0
+317767414,4903549431,0.0007047369999781949,114.46003909259218,2827,5691,4,0
+7286135580,1768859058,0.0038604249984928174,395.84248183992185,2827,5691,4,0
+4955445805,408478816,0.004975365000063903,567.4848259231705,2827,5691,4,0
+1574635374,674511693,0.005638265000015963,550.0748943362573,2827,5691,4,0
+574588784,408478820,0.0017026829991664272,264.35687307965287,2827,5691,4,0
+2608393065,1672267530,0.0066899590001412435,None,2827,5691,4,0
+475912313,316681910,0.002296397999089095,942.1180230345709,2827,5691,4,0
+408478785,408478782,3.515999924275093e-05,34.41546978302828,2827,5691,4,0
+6819437344,7030617904,0.005114505998790264,481.9151236333546,2827,5691,4,0
+5576939246,426930264,0.0032196729989664163,404.8320487549189,2827,5691,4,0
+3462099368,6448461993,0.0011556589997780975,336.8403336906005,2827,5691,4,0
+2611491719,7322098539,0.002025166000748868,127.20440767277066,2827,5691,4,0
+317766814,3211622700,0.002924200000052224,257.39751855926295,2827,5691,4,0
+3211622691,317841016,0.0020106070005567744,228.31392020003418,2827,5691,4,0
+1672267793,2639898842,4.00139997509541e-05,None,2827,5691,4,0
+687139205,473666781,0.005756730999564752,798.4822164089193,2827,5691,4,0
+317944964,7074500840,0.005764767000073334,595.4046228774345,2827,5691,4,0
+6001542006,6448462033,0.0026581789988995297,239.60236102067614,2827,5691,4,0
+2621386740,3307706689,0.004682353999669431,602.6995574419633,2827,5691,4,0
+1368670343,1988057398,0.00010174499948334415,None,2827,5691,4,0
+318015014,1827520766,0.00032931600071606226,133.73064158397338,2827,5691,4,0
+418009256,1828418234,0.0008581830006733071,372.47673656312475,2827,5691,4,0
+7286135545,1505992832,0.002671407000889303,333.42180486451286,2827,5691,4,0
+574588773,2628942175,0.004406083999128896,467.7994039103217,2827,5691,4,0
+7286135582,574457822,0.0035218540015193867,417.91642968790643,2827,5691,4,0
+574465017,306639015,0.005421254998509539,647.0098682163824,2827,5691,4,0
+3211622686,469733511,0.00482898500013107,438.215885183934,2827,5691,4,0
+3299068955,292484330,0.005828039998959866,None,2827,5691,4,0
+6389441585,2621462848,0.0035719669995160075,345.8873681392482,2827,5691,4,0
+6448462005,574465004,0.0037263630001689307,365.66170716426467,2827,5691,4,0
+563191209,2598868374,0.00414032499975292,459.08935453166885,2827,5691,4,0
+474997349,574475518,0.0017738960013957694,302.900774775551,2827,5691,4,0
+5023014978,1828254500,0.002982750000228407,613.4664202293044,2827,5691,4,0
+1975596505,574727042,0.00010751300033007283,None,2827,5691,4,0
+748845497,7321975008,0.0036298689992690925,391.74819594588735,2827,5691,4,0
+2608428534,1672334330,0.005719853999835323,None,2827,5691,4,0
+408478758,7207579521,0.0011213690013391897,411.93141465296424,2827,5691,4,0
+4955446060,6448462007,0.0010247830014122883,262.0362444929049,2827,5691,4,0
+3522260318,306636859,0.0016703650017007021,159.09788624831754,2827,5691,4,0
+317944963,7115183097,0.00045177299944043625,67.58201327566792,2827,5691,4,0
+1672334393,7140339574,3.7248000808176585e-05,None,2827,5691,4,0
+1505052639,321209231,0.0003251670004829066,110.67991376476547,2827,5691,4,0
+6603016875,574466058,0.0042789700000867015,801.7275688850564,2827,5691,4,0
+360747888,1362941669,0.00214783199953672,390.19244662333114,2827,5691,4,0
+665115010,7140339575,0.002468380000209436,230.1918558703617,2827,5691,4,0
+2600543766,2608678959,0.0026851429993257625,357.32480845699075,2827,5691,4,0
+2608429635,473666764,0.005058562001067912,508.8591038499049,2827,5691,4,0
+306636859,1828254502,0.0029110860014043283,314.00106339887475,2827,5691,4,0
+360747406,574470577,9.675000001152512e-05,None,2827,5691,4,0
+317838699,600858466,0.0019972089994553244,243.3738181224468,2827,5691,4,0
+7286135500,549931423,0.00242345999868121,347.69665268511926,2827,5691,4,0
+1827499344,563194931,0.004748850000396487,486.4783004817786,2827,5691,4,0
+7321902568,2701786783,0.004153976000452531,413.4167974494645,2827,5691,4,0
+1672267673,2608428514,3.134299913654104e-05,None,2827,5691,4,0
+2617662111,418009261,0.005612105000182055,542.7127650614764,2827,5691,4,0
+316681913,549920915,0.002585989999715821,209.40704035959422,2827,5691,4,0
+3111465600,306636854,0.0022153000008984236,284.8839743555975,2827,5691,4,0
+1362941681,1828418208,0.00014938200001779478,38.08279832815822,2827,5691,4,0
+687135582,1929118326,0.0037253930004226277,422.5319993114704,2827,5691,4,0
+4016874588,45217432,0.0027105959998152684,162.7814542661217,2827,5691,4,0
+1672267848,1362941670,0.0027536680008779513,197.42807498913555,2827,5691,4,0
+2608597329,2608597414,7.563600047433283e-05,24.250914290851785,2827,5691,4,0
+473666779,4016874420,0.004047926999191986,662.0691548354674,2827,5691,4,0
+292484326,5609334125,0.003304578998722718,246.8784762493996,2827,5691,4,0
+1828277191,408478761,0.005397925999204745,511.74173668766315,2827,5691,4,0
+549931436,317839832,0.002778755999315763,290.01162457737996,2827,5691,4,0
+574459687,358407314,8.618600077170413e-05,26.4283022332109,2827,5691,4,0
+1827268628,4016873481,0.0012722129995381692,342.2073375224712,2827,5691,4,0
+1505057722,360757808,0.0019327890004205983,310.3364405891029,2827,5691,4,0
+1956302545,1829747762,0.003493967999020242,983.4639697397456,2827,5691,4,0
+408478744,1827520758,0.002363265999520081,907.8637028422908,2827,5691,4,0
+1505052444,7286240207,0.004468482999072876,583.6255399147286,2827,5691,4,0
+3123285393,4016874420,0.001338246998784598,110.1168946479104,2827,5691,4,0
+1756155427,474997347,0.0023422689992003143,366.0420378552742,2827,5691,4,0
+1821186334,793260945,0.00170308999986446,624.7792861275356,2827,5691,4,0
+7321902573,408478786,0.004678018000049633,457.6392812766023,2827,5691,4,0
+2616315927,2632841183,0.0028574200005095918,350.1883124819374,2827,5691,4,0
+1253880620,1672267779,0.0006585709998034872,252.99978531798945,2827,5691,4,0
+418009800,1929118187,0.005643030001010629,751.0177733056021,2827,5691,4,0
+6417387131,2608393065,0.0019914919994334923,338.9348445433285,2827,5691,4,0
+2608501857,360747431,0.001970856999832904,254.55517532312925,2827,5691,4,0
+2604685993,1929118225,0.00582785100050387,549.0222840409713,2827,5691,4,0
+1609256705,4226442917,0.00021061499865027145,129.99971083575585,2827,5691,4,0
+440870188,1821291310,0.005217203000938753,623.262611050659,2827,5691,4,0
+6448462031,574546129,0.004983156000889721,489.9704653435302,2827,5691,4,0
+1830468180,426930261,0.004752380000354606,584.737718785695,2827,5691,4,0
+574546136,1960033968,0.0052270859996497165,606.7570010182741,2827,5691,4,0
+288947635,318014980,0.001687931999185821,188.5411256908574,2827,5691,4,0
+2634485437,426930258,0.0038379119996534428,468.55534135619905,2827,5691,4,0
+2385218592,1293287346,0.0003270209999755025,205.6821289013954,2827,5691,4,0
+292724874,6448462002,0.0016745599987189053,199.39809308575832,2827,5691,4,0
+2700898238,1867147170,0.005693700000847457,619.2286054124086,2827,5691,4,0
+2598987665,2608394482,0.003963834000387578,356.5664036847147,2827,5691,4,0
diff --git a/evaluation/results/example/queries/gasstation.csv b/evaluation/results/example/queries/gasstation.csv
index b5b826a..a145c27 100644
--- a/evaluation/results/example/queries/gasstation.csv
+++ b/evaluation/results/example/queries/gasstation.csv
@@ -1,101 +1,101 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,time_contracted_graph,time_state_graph
-574449274,7286181351,0.015018925999356725,194.81357670348197,2827,5691,3,0.01209944899983384,0.00015030699978524353
-1830470692,7115183094,0.013063663000139059,365.0701651885908,2827,5691,3,0.011355438000464346,0.00013336699976207456
-1672267516,7286240205,0.01965242699952796,365.4259696245748,2827,5691,3,0.011933394999687152,0.00014723399999638787
-2608429637,7030625396,0.013394438999966951,145.49989157996416,2827,5691,3,0.011491406000459392,0.00013302199931786163
-646729136,2604683547,0.014605790999667079,329.1692377041301,2827,5691,3,0.011617147999459121,0.0001327760001004208
-1927634037,600861117,0.054630894000183616,12183.340698138662,2827,5691,3,0.01177944800019759,0.00013192999995226273
-6448459754,687139213,0.01576280199969915,265.6577928817744,2827,5691,3,0.01159239900061948,0.00013257399950816762
-2705157125,563191192,0.01166417099921091,15.652806802931288,2827,5691,3,0.011384700999769848,0.00020409299941093195
-408478762,2608597178,0.01878609100003814,516.9025756105535,2827,5691,3,0.012922717000037665,0.00014733900025021285
-5023014975,2729891520,0.011952783000197087,149.55867942655965,2827,5691,3,0.011576683000384946,0.00014372300029208418
-2626137213,2604992645,0.01958304199979466,454.90186553427174,2827,5691,3,0.014248741999836056,0.0001479580005252501
-418009805,360747463,0.022044628999537963,None,2827,5691,3,0.01230095099981554,0.00013680099982593674
-2618898510,1505052639,0.018034554001133074,286.84951460120965,2827,5691,3,0.012579205000292859,0.00013387800026976038
-7158827508,1929118281,0.015208945999802381,267.7730506000322,2827,5691,3,0.011641946999588981,0.00013185199986764928
-292485413,1867147172,0.019499177999932726,419.7016162432571,2827,5691,3,0.011811246999968716,0.00014724799984833226
-318015069,268979973,0.01278751499921782,127.73244229126664,2827,5691,3,0.01174241599983361,0.00013392999971983954
-7286181370,321209223,0.021670625998922333,584.0213980757591,2827,5691,3,0.01232922300005157,0.00013350999961403431
-2608597178,2705157127,0.019550712999262032,466.55867829322426,2827,5691,3,0.01200022800003353,0.00013266599944472546
-600862363,2608501198,0.054031454001233215,11984.313626612588,2827,5691,3,0.011827582000478287,0.0001346380004179082
-1934188821,1828400039,0.05727468700024474,24347.28448705321,2827,5691,3,0.011709579000125814,0.00013376800052355975
-2608500961,418009803,0.015973399999893445,337.53501271787036,2827,5691,3,0.011786766999648535,0.0001339939999525086
-360747471,360747407,0.020735572000376123,None,2827,5691,3,0.011788970000452537,0.00013473899980454007
-677438068,1929118233,0.019666210000650608,422.19689265053086,2827,5691,3,0.011672347000057925,0.0001447180002287496
-574588784,2600543671,0.012342144001195265,35.201949823759065,2827,5691,3,0.011996940000244649,0.00013510300050256774
-4016873907,2623041433,0.017797880999751214,396.12785224778844,2827,5691,3,0.011562951000087196,0.00013397399925452191
-574505825,549944400,0.012854313999923761,199.78210090744187,2827,5691,3,0.01140368500000477,0.00013146099990990479
-2611370483,2608394368,0.015042540000649751,248.24857545894645,2827,5691,3,0.011913700999684806,0.0001535520004836144
-1830463045,687139215,0.012107460999686737,204.23245870150174,2827,5691,3,0.011665738000374404,0.00014054399980523158
-4955446064,2598985164,0.02055163699969853,473.8463632950769,2827,5691,3,0.011883760999808146,0.000134007999804453
-748845115,4955446060,0.015979974999027036,442.10631460582454,2827,5691,3,0.011759297000025981,0.0001416159993823385
-306636858,1828408218,0.011676494000312232,81.14322936786671,2827,5691,3,0.011212391999833926,0.0001344780002909829
-360747732,4475752956,0.044248160998904496,None,2827,5691,3,0.011578495999856386,0.0001354529995296616
-2639898823,333265684,0.013066581999737537,152.6155058467752,2827,5691,3,0.012058493000040471,0.00015590899965900462
-1828269090,1934189386,0.011976109999523032,None,2827,5691,3,0.011654058999738481,0.00013586499972007005
-4955446064,7158827520,0.01932779699927778,433.5161478960859,2827,5691,3,0.011668669999380654,0.0001450730005672085
-360747697,34053451,0.047545055000227876,None,2827,5691,3,0.011989263000032224,0.00014054900020710193
-1828418198,4016874590,0.012145542000325804,8.310544046719077,2827,5691,3,0.011931345999983023,0.00013828000010107644
-1929118261,6943345432,0.013831805000336317,226.68264809697095,2827,5691,3,0.011486258000331873,0.00013466699965647422
-288944218,4955446074,0.012797487999705481,146.75851962977313,2827,5691,3,0.012289352999687253,0.00014908899993315572
-3191239426,360747489,0.013128102000337094,120.20878164582994,2827,5691,3,0.011605712000346102,0.00015101499957381748
-7140339578,574466056,0.018418351000036637,536.310376605903,2827,5691,3,0.011457124999651569,0.00013295799999468727
-1672334342,1828269090,0.01177331899998535,None,2827,5691,3,0.011556862000361434,0.00013753699931839947
-3462099368,7030626843,0.013842734000718337,323.20742666960535,2827,5691,3,0.012424718999682227,0.00013912900067225564
-563194902,4383156581,0.012654706001740124,81.0656456093864,2827,5691,3,0.011890292000316549,0.0001382630007356056
-2614920419,317841014,0.01737158600008115,343.646988063927,2827,5691,3,0.012107259000003978,0.00014161099988996284
-5609333813,4016873925,0.013318471999809844,137.0727625051702,2827,5691,3,0.012697295999714697,0.0001429330004611984
-360747548,4955446073,0.012103218999072851,None,2827,5691,3,0.011838233999696968,0.0001426779999746941
-4016874619,7030602782,0.013167287000214856,121.68675544208482,2827,5691,3,0.011847499999930733,0.00017007200040097814
-4929232376,687139214,0.015711972999270074,328.2759130247716,2827,5691,3,0.01146052999956737,0.0001338989995929296
-563191181,317767227,0.015062797000609862,374.2933101732441,2827,5691,3,0.01169167500029289,0.0001368080002066563
-2614897350,2608429851,0.017553908999616397,380.2359540707999,2827,5691,3,0.011829070999738178,0.00014087199997447897
-1828400039,3307706662,0.06068579699967813,37367.92191261726,2827,5691,3,0.012305381999794918,0.0001450929994462058
-600861113,3273201483,0.013261052000416385,353.9040093658782,2827,5691,3,0.011826281999674393,0.00013996200050314656
-360747468,2709164479,0.017399234000549768,245.74095622933788,2827,5691,3,0.012502657999903022,0.0001398270005665836
-294919113,360747793,0.020799636999981885,None,2827,5691,3,0.01149400499980402,0.0001398009999320493
-2604949484,430534360,0.020591855000020587,531.444063767383,2827,5691,3,0.01192563600034191,0.00013852800020686118
-474997017,2598988012,0.013450028000988823,224.84622715583626,2827,5691,3,0.011536746999809111,0.00013996800043969415
-90713490,574727048,0.012300025000513415,None,2827,5691,3,0.012088536000192107,0.00014108600043982733
-4955446060,317958831,0.013021018000472395,253.1386779169229,2827,5691,3,0.01163436500064563,0.00017535999995743623
-1768859055,45217541,0.012589740000294114,369.37797748545194,2827,5691,3,0.011512703000335023,0.00013626999952975893
-2604992659,6448462029,0.015704702000221005,330.9659384616292,2827,5691,3,0.011701393000294047,0.0001405019993399037
-2619060546,7140339572,0.020564095000736415,534.3572520800851,2827,5691,3,0.011498877999656543,0.000260530000559811
-3668786925,2634485441,0.012577534999763884,87.54956980452867,2827,5691,3,0.011673900999994657,0.00013813700024911668
-574475517,2973923285,0.019423581999944872,479.8360902158978,2827,5691,3,0.01137950100019225,0.0001590609999766457
-2598868374,665115011,0.01748340999984066,454.0896767954179,2827,5691,3,0.011772404999646824,0.0001395919998685713
-5113940072,2611370483,0.01968589499938389,506.69207730498493,2827,5691,3,0.011650995999843872,0.00013981600022816565
-1929118226,306636860,0.013906837998547417,481.1279796611201,2827,5691,3,0.011932200999581255,0.00013702399974135915
-426948333,4383156580,0.06280240799969761,29426.11244954581,2827,5691,3,0.011752409000109765,0.00013736199980485253
-7030617897,2634485459,0.012872112000877678,146.1957070244722,2827,5691,3,0.011659931000394863,0.0001313680004386697
-2729891690,7321902563,0.013829377000547538,373.0782873038615,2827,5691,3,0.011507036000693915,0.0001431459995728801
-418009801,5609333814,0.0176972030003526,384.5693052272371,2827,5691,3,0.012787892000233114,0.0001344760003121337
-45217462,7030602777,0.014939913001398963,198.85245885438133,2827,5691,3,0.012099903000489576,0.00013436400058708386
-7322098548,90713487,0.014599467999687477,240.92212818527582,2827,5691,3,0.011295960000097693,0.00013149299957149196
-1929118240,2617662105,0.01204746100029297,347.67919068459423,2827,5691,3,0.011417407999942952,0.00016900500031624688
-1929118302,7030617896,0.016128723000292666,418.0060975157141,2827,5691,3,0.011558555000192428,0.0001426680000804481
-288943155,2705157131,0.015667831000428123,423.6989363258847,2827,5691,3,0.01178254200021911,0.00014033400020707631
-6448462030,5113940036,0.05754554100076348,7202.518819212052,2827,5691,3,0.011936375000004773,0.0001444469999114517
-6448459778,473666786,0.08914263899987418,552.761982386143,2827,5691,3,0.0800569290004205,0.00013604400010081008
-306636856,1199554350,0.012293567999222432,147.70987970142252,2827,5691,3,0.01149414599967713,0.00013973499972053105
-3376536295,4903549431,0.01264663600068161,236.41437406265553,2827,5691,3,0.011278377000053297,0.00013450800088321557
-7140363810,7182110437,0.020272478999686427,506.6812140226577,2827,5691,3,0.011974701999861281,0.0001488679999965825
-430536880,1618977288,0.06175760199857905,13995.217609377522,2827,5691,3,0.011928469999475055,0.0001359549996777787
-2604684729,408478826,0.018585697999697004,387.9706827162471,2827,5691,3,0.01172695199966256,0.00014131799980532378
-1672267779,7042580417,0.012743102999593248,None,2827,5691,3,0.012518847000137612,0.00014342499980557477
-7321902568,321209231,0.01946347800003423,463.1345950736491,2827,5691,3,0.011920476999875973,0.0001360810001642676
-7042580411,549947350,0.013801319000776857,595.6450427142878,2827,5691,3,0.011524159000146028,0.00013720100014324998
-2335713723,6389441585,0.012861416998930508,97.70926013331479,2827,5691,3,0.012198081999486021,0.00014589599959435873
-7286135546,3273193623,0.012108061000617454,90.18525327898215,2827,5691,3,0.011402422999708506,0.00013520100037567317
-469720334,2385218587,0.053339213000981545,14300.787278455899,2827,5691,3,0.012162844000158657,0.00013995800054544816
-2611494654,17689721,0.017071375000341504,292.34574833206705,2827,5691,3,0.012691732000348566,0.00015612199968018103
-3123285425,418009264,0.020605624000381795,413.37339509309425,2827,5691,3,0.012426183000570745,0.0001423559997419943
-17689726,1756155427,0.011878596999849833,None,2827,5691,3,0.011697631000060937,0.0001359309999315883
-5095519272,7158827515,0.017856057999779296,425.50618767906104,2827,5691,3,0.011642557000413944,0.00013655400016432395
-7321902571,473666768,0.020817354999962845,597.809710233175,2827,5691,3,0.011727275000339432,0.00014099999953032238
-574465013,665115011,0.019758383000407775,364.7229266193342,2827,5691,3,0.014047600999219867,0.00016872100059117656
-317840789,288946075,0.016765909000241663,336.3806379659176,2827,5691,3,0.012114144000406668,0.0001369559995509917
-288944217,474997356,0.020753676999447634,574.6411234434853,2827,5691,3,0.013019476000408758,0.00014130899944575503
-45217522,34053439,0.014788786999815784,120.5084189052182,2827,5691,3,0.01188141100010398,0.000141453999276564
-17689721,1937178491,0.01199420400098461,None,2827,5691,3,0.011671221000142395,0.00016485100059071556
-1934201756,1927634129,0.05159768700013956,10071.104160109138,2827,5691,3,0.012008661999971082,0.0001401170002282015
+317839015,2608597414,0.014744856000106665,134.20641775784284,2827,5691,3,0.01360871699944255,0.00018580899995868094
+600866936,574459683,0.013445653003145708,42.73345795958952,2827,5691,3,0.01312823400076013,0.00012962000073457602
+1828400048,318014988,0.04508312200050568,12597.210765371754,2827,5691,3,0.013359325999772409,0.0001293499990424607
+1821291294,1253890891,0.015102212000783766,146.42601273567817,2827,5691,3,0.013108363998981076,0.00012954300109413452
+306636860,574546129,0.021913780999966548,480.5650193392354,2827,5691,3,0.014186061000145855,0.00016740600040066056
+1828269031,1293287346,0.013517352997951093,None,2827,5691,3,0.01333533599972725,0.00013080499957141
+7246644043,1785834373,0.04697897699952591,16215.671754130091,2827,5691,3,0.013071960000161198,0.00013017499986744951
+317767414,4903549431,0.01463343500290648,114.46003909259218,2827,5691,3,0.01367291500173451,0.0001311960004386492
+7286135580,1768859058,0.021128653997948277,395.84248183992185,2827,5691,3,0.01332887599892274,0.00015218999942590017
+4955445805,408478816,0.02038410500063037,567.4848259231705,2827,5691,3,0.014007543000843725,0.00013225700058683287
+1574635374,674511693,0.022711544999765465,550.0748943362573,2827,5691,3,0.013221170998804155,0.00013156100067135412
+574588784,408478820,0.015860685998632107,264.35687307965287,2827,5691,3,0.013269631999719422,0.0001433849993190961
+2608393065,1672267530,0.02120067899886635,None,2827,5691,3,0.012982984999325708,0.00012978899940208066
+475912313,316681910,0.03661696699964523,None,2827,5691,3,0.013272662999952445,0.00013025699990976136
+408478785,408478782,0.01335668800129497,34.41546978302828,2827,5691,3,0.013155561000530724,0.00013067400141153485
+6819437344,7030617904,0.020616521000192733,481.9151236333546,2827,5691,3,0.01325901500058535,0.00012987399895791896
+5576939246,426930264,0.01813270700040448,404.8320487549189,2827,5691,3,0.013295957000082126,0.00012982299995201174
+3462099368,6448461993,0.01492688800135511,336.8403336906005,2827,5691,3,0.013297892000991851,0.00013158399997337256
+2611491719,7322098539,0.015226998999423813,127.20440767277066,2827,5691,3,0.013001630999497138,0.00013032100105192512
+317766814,3211622700,0.017560330998094287,257.39751855926295,2827,5691,3,0.013642739999340847,0.00012993800010008272
+3211622691,317841016,0.01605682700210309,228.31392020003418,2827,5691,3,0.013104208001095685,0.00012974600031157024
+1672267793,2639898842,0.013576304998423439,None,2827,5691,3,0.013391410999247455,0.0001317349997407291
+687139205,473666781,0.05873310200149717,21284.78951469599,2827,5691,3,0.013105932001053588,0.00012953799887327477
+317944964,7074500840,0.09021241399932478,595.4046228774345,2827,5691,3,0.08123479099958786,0.00013472099999489728
+6001542006,6448462033,0.017114640000727377,239.60236102067614,2827,5691,3,0.013359926000703126,0.00013122900054440834
+2621386740,3307706689,0.06057792800129391,13757.751317810707,2827,5691,3,0.013323855000635376,0.00013254700024845079
+1368670343,1988057398,0.014174374999129213,None,2827,5691,3,0.013893127999835997,0.00013867599955119658
+318015014,1827520766,0.014037809001820278,133.73064158397338,2827,5691,3,0.013369598000281258,0.00013271900024847127
+418009256,1828418234,0.014920352001354331,372.47673656312475,2827,5691,3,0.013473558999976376,0.00013305900029081386
+7286135545,1505992832,0.01740010799949232,333.42180486451286,2827,5691,3,0.013229247999333893,0.00014976000056776684
+574588773,2628942175,0.019585927999287378,467.7994039103217,2827,5691,3,0.013428812999336515,0.0001361089998681564
+7286135582,574457822,0.019233685001381673,417.91642968790643,2827,5691,3,0.013392927001405042,0.0001359289999527391
+574465017,306639015,0.0597478650015546,11948.126563447147,2827,5691,3,0.013375279000683804,0.0001372440001432551
+3211622686,469733511,0.021443912000904675,438.215885183934,2827,5691,3,0.013558950000515324,0.00013508700067177415
+3299068955,292484330,0.02268162700056564,None,2827,5691,3,0.013668857000084245,0.00013551600022765342
+6389441585,2621462848,0.019520357998771942,345.8873681392482,2827,5691,3,0.014143837999654352,0.0001378009983454831
+6448462005,574465004,0.01950055200177303,365.66170716426467,2827,5691,3,0.013424208000287763,0.00013228100033302326
+563191209,2598868374,0.018871600999773364,459.08935453166885,2827,5691,3,0.01336402200104203,0.00013308099914866034
+474997349,574475518,0.01654568300182291,302.900774775551,2827,5691,3,0.013606008000351721,0.00014219400145520922
+5023014978,1828254500,0.04786720499942021,10707.018987925252,2827,5691,3,0.01381025699993188,0.00015112400069483556
+1975596505,574727042,0.013651896000737906,None,2827,5691,3,0.013381559001572896,0.00013056900024821516
+748845497,7321975008,0.018897404999734135,391.74819594588735,2827,5691,3,0.013289439999425667,0.00014768499931960832
+2608428534,1672334330,0.021730714997829637,None,2827,5691,3,0.013319596999281202,0.00013040299927524757
+408478758,7207579521,0.014967889997933526,411.93141465296424,2827,5691,3,0.013712717998714652,0.00013140599912730977
+4955446060,6448462007,0.015847341001062887,262.0362444929049,2827,5691,3,0.014349682000101893,0.0001306829999521142
+3522260318,306636859,0.01651672200023313,159.09788624831754,2827,5691,3,0.01415445800012094,0.0001315930003329413
+317944963,7115183097,0.014076691999434843,67.58201327566792,2827,5691,3,0.013358292999328114,0.00014350499986903742
+1672334393,7140339574,0.013464496998494724,None,2827,5691,3,0.013281780000397703,0.00013003399908484425
+1505052639,321209231,0.014089561000218964,110.67991376476547,2827,5691,3,0.013498858999810182,0.00013198099986766465
+6603016875,574466058,0.0556388879995211,17672.681488188096,2827,5691,3,0.013310446998730185,0.00013132400090398733
+360747888,1362941669,0.042388309999296325,390.19244662333114,2827,5691,3,0.03872365200004424,0.00013338899952941574
+665115010,7140339575,0.01687236499856226,230.1918558703617,2827,5691,3,0.013209437000114121,0.00013066399878880475
+2600543766,2608678959,0.01726994300042861,357.32480845699075,2827,5691,3,0.013283836999107734,0.0001558620006107958
+2608429635,473666764,0.021558593998634024,508.8591038499049,2827,5691,3,0.013297732999490108,0.0001312000003963476
+306636859,1828254502,0.017562312001246028,314.00106339887475,2827,5691,3,0.013473315999362967,0.00013170600141165778
+360747406,574470577,0.013888342999052838,None,2827,5691,3,0.013619646000734065,0.00013231999946583528
+317838699,600858466,0.016350759002307313,243.3738181224468,2827,5691,3,0.013412896001682384,0.00013206599942350294
+7286135500,549931423,0.017679720998785342,347.69665268511926,2827,5691,3,0.013455006999720354,0.00013131599916960113
+1827499344,563194931,0.020994309001252986,486.4783004817786,2827,5691,3,0.01335946500148566,0.0001309159997617826
+7321902568,2701786783,0.019514910001817043,413.4167974494645,2827,5691,3,0.013455555001200992,0.00013304500134836417
+1672267673,2608428514,0.013608981000288622,None,2827,5691,3,0.013438216999929864,0.0001318280010309536
+2617662111,418009261,0.021618426000713953,542.7127650614764,2827,5691,3,0.01330174199938483,0.00013181200120016
+316681913,549920915,0.01702238799953193,209.40704035959422,2827,5691,3,0.013606597998659709,0.00013064500126347411
+3111465600,306636854,0.016745760001867893,284.8839743555975,2827,5691,3,0.013415475999863702,0.0001328510006715078
+1362941681,1828418208,0.013417924003078952,38.08279832815822,2827,5691,3,0.013075033000859548,0.00013135700100974645
+687135582,1929118326,0.019515803000103915,422.5319993114704,2827,5691,3,0.013696173000425915,0.00013115399997332133
+4016874588,45217432,0.01602308900146454,162.7814542661217,2827,5691,3,0.013247868000689778,0.0001318220001849113
+1672267848,1362941670,0.01622420799867541,197.42807498913555,2827,5691,3,0.01338234799914062,0.0001311369996983558
+2608597329,2608597414,0.01330244800010405,24.250914290851785,2827,5691,3,0.013061052999546519,0.00015016500037745573
+473666779,4016874420,0.04831702699993912,9987.30777893103,2827,5691,3,0.01414532099988719,0.00013084300007903948
+292484326,5609334125,0.018099939001331222,246.8784762493996,2827,5691,3,0.01332767399981094,0.00013139000111550558
+1828277191,408478761,0.021816641001350945,511.74173668766315,2827,5691,3,0.013699850000193692,0.0001314210003329208
+549931436,317839832,0.0174974050023593,290.01162457737996,2827,5691,3,0.013432845000352245,0.00013076600043859798
+574459687,358407314,0.013416028998108231,26.4283022332109,2827,5691,3,0.013164205998691614,0.0001307200000155717
+1827268628,4016873481,0.015134676998059149,342.2073375224712,2827,5691,3,0.013234934998763492,0.00014741599989065435
+1505057722,360757808,0.016729213000871823,310.3364405891029,2827,5691,3,0.013792359000944998,0.00013292899893713184
+1956302545,1829747762,0.04730788099732308,None,2827,5691,3,0.013086324999676435,0.0001307379989157198
+408478744,1827520758,0.061721502997897915,None,2827,5691,3,0.013642284999150434,0.00013610399946628604
+1505052444,7286240207,0.020997281000745716,583.6255399147286,2827,5691,3,0.013311545000760816,0.00013124699944455642
+3123285393,4016874420,0.015367218000392313,110.1168946479104,2827,5691,3,0.013354204998904606,0.0001328470007138094
+1756155427,474997347,0.01668404600059148,366.0420378552742,2827,5691,3,0.013197324000429944,0.0001299779996770667
+1821186334,793260945,0.037566377002804074,9984.519106700938,2827,5691,3,0.013066467001408455,0.00013091900109429844
+7321902573,408478786,0.020922699999573524,457.6392812766023,2827,5691,3,0.013170170999728725,0.00013120900075591635
+2616315927,2632841183,0.018248206997668603,350.1883124819374,2827,5691,3,0.013384428999415832,0.00013132299864082597
+1253880620,1672267779,0.014399445999515592,252.99978531798945,2827,5691,3,0.013287362000482972,0.0001333069994871039
+418009800,1929118187,0.060067320002417546,32322.769678588895,2827,5691,3,0.013104875000863103,0.00013295400094648357
+6417387131,2608393065,0.016502829001183272,338.9348445433285,2827,5691,3,0.013328734999959124,0.00013170500096748583
+2608501857,360747431,0.015844211000512587,254.55517532312925,2827,5691,3,0.013066278999758651,0.0001306810008827597
+2604685993,1929118225,0.022591688999455073,549.0222840409713,2827,5691,3,0.014158453999698395,0.0001323020005656872
+1609256705,4226442917,0.014106370999797946,129.99971083575585,2827,5691,3,0.01368060200002219,0.00013204599963501096
+440870188,1821291310,0.05365529599839647,6773.4203800254845,2827,5691,3,0.013636416999361245,0.00014434999866352882
+6448462031,574546129,0.021721081997384317,489.9704653435302,2827,5691,3,0.013431795998258167,0.00013301800026965793
+1830468180,426930261,0.020933702997353976,584.737718785695,2827,5691,3,0.013944933998573106,0.00015768399862281512
+574546136,1960033968,0.06379088700123248,14417.01211043156,2827,5691,3,0.01344966099895828,0.00013384700105234515
+288947635,318014980,0.01575918699745671,188.5411256908574,2827,5691,3,0.013497629999619676,0.00013075799870421179
+2634485437,426930258,0.0199080150014197,468.55534135619905,2827,5691,3,0.013521945000320557,0.00013154299995221663
+2385218592,1293287346,0.014118840999799431,205.6821289013954,2827,5691,3,0.013440292999803205,0.00013218100139056332
+292724874,6448462002,0.01648463899982744,199.39809308575832,2827,5691,3,0.013632131000122172,0.00013203299931774382
+2700898238,1867147170,0.053762276000270504,6620.8462700027985,2827,5691,3,0.013260215999252978,0.00013100800060783513
+2598987665,2608394482,0.044826775998444646,356.5664036847147,2827,5691,3,0.03919520499948703,0.00013194999883126002
diff --git a/evaluation/run.py b/evaluation/run.py
index af2e0ac..8684b4b 100644
--- a/evaluation/run.py
+++ b/evaluation/run.py
@@ -7,9 +7,9 @@ from pathlib import Path
import yaml
from evrouting.osm.imports import read_osm
-from evaluation.T import *
-from evaluation.export import write_head, write_row
-from evaluation.queries import *
+from lib.T import *
+from lib.export import write_head, write_row
+from lib.queries import *
def query_benchmark(graphs, conf, result_dir):
diff --git a/evrouting/gasstation/routing.py b/evrouting/gasstation/routing.py
index 0f421a7..669a8d8 100644
--- a/evrouting/gasstation/routing.py
+++ b/evrouting/gasstation/routing.py
@@ -114,7 +114,10 @@ def contract_graph(G: nx.Graph, charging_stations: Set[Node], capacity: SoC,
H.add_node(cs, **G.nodes[cs])
# Iterate unvisited charging stations
for n_cs in all_cs[i + 1:]:
- path = nx.algorithms.shortest_path(G, cs, n_cs, weight=DISTANCE_KEY)
+ try:
+ path = nx.algorithms.shortest_path(G, cs, n_cs, weight=DISTANCE_KEY)
+ except nx.NetworkXNoPath:
+ continue
w_cs_n: SoC = f.path_consumption(G, path)
if w_cs_n <= capacity:
H.add_edge(
diff --git a/evrouting/osm/imports.py b/evrouting/osm/imports.py
index effbbc1..e042024 100644
--- a/evrouting/osm/imports.py
+++ b/evrouting/osm/imports.py
@@ -170,6 +170,17 @@ class Way(object):
self.nds = []
self.tags = {}
+ @staticmethod
+ def slice_array(waypoints, node_pass_count):
+ slices = []
+ start_last_slice = 0
+ for i, w in range(1, len(waypoints) - 1):
+ if node_pass_count[waypoints[i]] > 1:
+ slices.append(waypoints[start_last_slice: i + 1])
+ start_last_slice = i
+ slices.append(waypoints[start_last_slice:])
+ return slices
+
def split(self, node_pass_count):
"""
Slice way at every crossing i.e. when a waypoint is passend by
@@ -177,18 +188,7 @@ class Way(object):
"""
# slice the node-array using this nifty recursive function
- def slice_array(waypoints):
- for i in range(1, len(waypoints) - 1):
- if node_pass_count[waypoints[i]] > 1:
- left = waypoints[:i + 1]
- right = waypoints[i:]
-
- rightsliced = slice_array(right)
-
- return [left] + rightsliced
- return [waypoints]
-
- slices = slice_array(self.nds)
+ slices = Way.slice_array(self.nds, node_pass_count)
# create a way object for each node-array slice
ret = []
diff --git a/setup.py b/setup.py
index 5d2f8bc..14cce94 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ setup(
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
- packages=['evrouting'],
+ packages=find_packages(),
python_requires='>=3.4.*, <4',
install_requires=[
'networkx',
diff --git a/tests/osm/test_import.py b/tests/osm/test_import.py
new file mode 100644
index 0000000..0ffc31c
--- /dev/null
+++ b/tests/osm/test_import.py
@@ -0,0 +1,22 @@
+from evrouting.osm.imports import Way
+
+
+def test_slice():
+ way = list(range(10))
+ node_pass_count = {w: 1 for w in way}
+ node_pass_count[0] = 2
+ node_pass_count[4] = 2
+ node_pass_count[6] = 2
+ node_pass_count[9] = 2
+
+ slices = Way.slice_array(way, node_pass_count)
+
+ assert slices == [[0, 1, 2, 3, 4], [4, 5, 6], [6, 7, 8, 9]]
+
+
+def test_slice_short():
+ way = [0, 1]
+ node_pass_count = {w: 1 for w in way}
+ slices = Way.slice_array(way, node_pass_count)
+
+ assert slices == [[0, 1]]
--
GitLab