From bd536c43e63ff167262b5a129cc7b6837ab2f093 Mon Sep 17 00:00:00 2001
From: "niehues.mark@gmail.com" <niehues.mark@gmail.com>
Date: Mon, 4 May 2020 18:39:44 +0200
Subject: [PATCH] wip
---
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 +++++++++---------
evrouting/osm/imports.py | 12 +-
5 files changed, 404 insertions(+), 408 deletions(-)
diff --git a/evaluation/results/example/queries/astar.csv b/evaluation/results/example/queries/astar.csv
index df2ed36..f0132aa 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
-418009821,3211622686,0.006104560998210218,299.53940761745315,2827,5691,4
-687135582,1929118274,0.014193412000167882,309.984257120316,2827,5691,4
-440870156,7030625397,0.0061211930005811155,266.8755777965704,2827,5691,4
-764105827,360757816,0.022421349000069313,363.03519416670315,2827,5691,4
-2604687836,7172883306,0.00964734899753239,235.90323152184388,2827,5691,4
-1937178498,2600722212,0.014495750001515262,826.6488628265173,2827,5691,4
-7140363811,1362941670,0.002194104999944102,112.06217872199922,2827,5691,4
-408478842,549920911,0.024493662000168115,619.5302552884552,2827,5691,4
-2618923396,7321870100,0.020439506999537116,344.33164889729017,2827,5691,4
-2598983042,2600543396,0.003676929001812823,154.51239134256772,2827,5691,4
-6389441585,292992947,0.0046343940011865925,153.9857116374839,2827,5691,4
-2635713649,508823988,0.0011040609970223159,53.38509628553214,2827,5691,4
-418009801,574465015,0.019862241002556402,527.1319006025898,2827,5691,4
-3123285425,418009262,0.019179090999386972,423.7599548271774,2827,5691,4
-1672334378,6604102084,0.0005345360004866961,None,2827,5691,4
-7322098545,3462099369,0.012186392999865348,288.4592989060882,2827,5691,4
-7321870120,687135582,0.01937217000158853,419.35494759758376,2827,5691,4
-1362941693,7030617904,0.01267877300051623,237.46407404483605,2827,5691,4
-2621386732,574449258,0.009933132998412475,417.7439980535539,2827,5691,4
-2608786278,2696560492,0.02037083599861944,517.8714975683342,2827,5691,4
-408478834,563194906,0.0016063030016084667,258.9848957044358,2827,5691,4
-4321209901,7140363801,0.03440023399889469,566.2186955636021,2827,5691,4
-2360479290,2621360525,0.007676676999835763,367.192459628314,2827,5691,4
-6603016876,1656016522,0.012310263002291322,792.3742000871882,2827,5691,4
-7031746250,7030623427,0.03028190500117489,703.1864446314731,2827,5691,4
-318260941,7245276256,0.0011035440002160612,48.451769744859156,2827,5691,4
-318266812,574465010,0.002685529998416314,177.57906338443627,2827,5691,4
-2734185688,318266811,0.005424671999207931,251.8290305630775,2827,5691,4
-370935760,360747915,0.006330265998258255,252.2380450378266,2827,5691,4
-1505992709,1253890916,0.0131219399991096,250.9143336993809,2827,5691,4
-574482750,318015069,0.00726907799980836,206.1122097057147,2827,5691,4
-360747548,469718545,0.000575995996769052,None,2827,5691,4
-7286240207,748845418,0.015126278001844184,466.32838207409696,2827,5691,4
-7257113601,2621360552,0.006748152001819108,280.2626114105422,2827,5691,4
-600855077,426930266,0.01148781899973983,341.5483793234692,2827,5691,4
-318014995,3111465597,0.0015463759991689585,114.39171887865092,2827,5691,4
-2360384211,318261951,0.029054182003164897,645.4157811529808,2827,5691,4
-7031746252,600855671,0.014197254000464454,523.4061339411232,2827,5691,4
-360747557,318261953,0.0004935129982186481,None,2827,5691,4
-2600543577,2696567095,0.0024848339999152813,110.10425255510617,2827,5691,4
-247326136,7286181354,0.0009874740026134532,None,2827,5691,4
-2608679794,574588781,0.018018837999989046,398.6061493763712,2827,5691,4
-671239369,574505822,0.021361379000154557,504.481438611962,2827,5691,4
-549920910,2611494644,0.0023182099976111203,107.9361662137449,2827,5691,4
-4321209901,318014996,0.008295280000311323,232.0745739049763,2827,5691,4
-574567080,2598986957,0.0010548459977144375,69.05491249038947,2827,5691,4
-5023014977,1828269031,0.013065744999039453,591.3147075714494,2827,5691,4
-405229450,317839975,0.013558738002757309,389.3299727634748,2827,5691,4
-1672267605,288944219,8.001700189197436e-05,None,2827,5691,4
-7247195349,360747893,0.03431698900021729,None,2827,5691,4
-7257113603,306636853,0.015006112000264693,437.05718284325974,2827,5691,4
-6604102084,360747507,0.004187366001133341,225.63308448102424,2827,5691,4
-2619060548,5023014976,0.025399616002687253,684.1927186887414,2827,5691,4
-3152652408,418009809,0.012287208999623545,356.9359172377983,2827,5691,4
-2612700813,1828418194,0.019697299001563806,404.9649358227012,2827,5691,4
-600855068,1829747761,0.01874661100009689,321.4304820539351,2827,5691,4
-34053441,549931423,0.015394361998914974,330.7515498416791,2827,5691,4
-1827499342,2608786068,0.004230339000059757,157.0355576542001,2827,5691,4
-7042579827,7165728796,0.01010862399925827,439.48176347319736,2827,5691,4
-600852672,294919193,0.00636463099726825,194.60045978800466,2827,5691,4
-2604684732,2608394376,0.003939808000723133,225.67874677578376,2827,5691,4
-2729892258,3111465599,0.021413187998405192,636.1250774293167,2827,5691,4
-7286240209,317839014,0.008988310997665394,215.53051978929957,2827,5691,4
-2554184498,318261955,0.010288174002198502,368.4077854834947,2827,5691,4
-360747527,4903537220,0.004058121001435211,308.9247309449616,2827,5691,4
-665115010,2598982037,0.018486098997527733,375.10086789924367,2827,5691,4
-549914986,2604688050,0.01721384700067574,406.62789799724936,2827,5691,4
-7321902560,7202546043,0.02634392600157298,647.8841126042021,2827,5691,4
-2952146882,7247195349,0.00973741699999664,284.15726187079684,2827,5691,4
-7042580419,2608678794,0.016572495002037613,698.3454072097257,2827,5691,4
-7286240203,4016874623,0.003301780998299364,165.24731610205183,2827,5691,4
-1672334354,600861115,0.023482880998926703,770.4024309119364,2827,5691,4
-2614920443,3111465611,0.005223342999670422,177.8696047315475,2827,5691,4
-360747578,574485682,0.0003176179998263251,None,2827,5691,4
-2734185688,4903549431,0.010346074999688426,439.4930627514446,2827,5691,4
-2631500008,1830470676,0.013691763000679202,357.51214838441797,2827,5691,4
-1867147170,1828269031,0.009278511999582406,436.3097512530265,2827,5691,4
-5113940072,321209222,0.0005723329995817039,84.32254165537744,2827,5691,4
-318260732,317839537,0.0014463949992205016,69.7984740636073,2827,5691,4
-1574635372,288943146,0.0005371530023694504,None,2827,5691,4
-5609333814,3177732288,0.007666186000278685,368.10345899843935,2827,5691,4
-294919195,2639898838,0.0027401549996284302,140.21450329712175,2827,5691,4
-7042580417,435112933,0.005415321000327822,535.8777439426531,2827,5691,4
-1672340374,6448461991,0.006781173000490526,286.2837684453694,2827,5691,4
-508823963,1929118187,0.03158039900154108,625.7948384834564,2827,5691,4
-1368670342,574449298,0.011055918002966791,289.11487947498966,2827,5691,4
-1828400048,1362941672,0.004677607998019084,490.31985636850595,2827,5691,4
-4016874408,288944220,0.009151702000963269,235.07185286856708,2827,5691,4
-1672267709,473666786,0.017260035001527285,408.9790017628481,2827,5691,4
-7286181353,4475742630,0.009001542999612866,335.2071411763051,2827,5691,4
-549928583,1820309648,0.008944230001361575,287.5714344469538,2827,5691,4
-2701813226,4955446072,0.001467952002712991,270.90837236452404,2827,5691,4
-408478826,7286240207,0.020211972001561662,654.9357242070321,2827,5691,4
-473666774,292484328,0.031528712999715935,None,2827,5691,4
-7165728799,7115183091,0.001273580997803947,88.19239151226196,2827,5691,4
-2635713654,4955446028,0.005855952000274556,125.05689399557589,2827,5691,4
-5113940036,1293287346,0.006259828998736339,399.1991755729142,2827,5691,4
-1672267690,7286135545,0.0001547169995319564,None,2827,5691,4
-574457817,1672334393,0.029624519000208238,821.5688985611807,2827,5691,4
-3111465608,410486365,0.01118067700008396,389.0809006977434,2827,5691,4
+2598984220,317431286,0.014743257001100574,498.1140111598792,2827,5691,4
+1574635376,2608394376,0.0005354649983928539,None,2827,5691,4
+292485282,2639932980,0.012163879997387994,288.6212594295983,2827,5691,4
+7115183090,49109518,0.02806976899955771,904.9345063361109,2827,5691,4
+563188714,2616315920,0.004677771001297515,441.49586624662686,2827,5691,4
+2705157118,3299068955,0.004833793002035236,344.81142283925794,2827,5691,4
+3462099369,1935264851,0.02602331299931393,1063.5350428566937,2827,5691,4
+1827520760,1927634075,0.0005738439976994414,None,2827,5691,4
+7286135582,318014975,0.00770781800019904,291.32161516417983,2827,5691,4
+1949865714,1929118103,0.008719715002371231,247.41047878926767,2827,5691,4
+7321855875,7286135544,0.004166588998486986,203.13436437693898,2827,5691,4
+7031746253,1362941693,0.01121524500194937,567.6960773066983,2827,5691,4
+549928581,7042580423,0.023464070000045467,652.1459029950373,2827,5691,4
+306636859,3123285393,0.0015295260018319823,134.30855985472655,2827,5691,4
+1828263505,7245276253,0.00288734000059776,172.3946058972845,2827,5691,4
+3111465609,333265684,0.0034014749980997294,158.3747300421578,2827,5691,4
+574465020,7158827509,0.0005803460007882677,50.69540952494169,2827,5691,4
+4955446038,2701786783,0.016037132001656573,474.42019948624187,2827,5691,4
+1505057722,2598982820,0.0022350040017045103,213.63162923041278,2827,5691,4
+6417387121,45217575,0.015323709001677344,511.57995760781023,2827,5691,4
+3307706690,2608500686,0.020143385001574643,704.3773911683422,2827,5691,4
+508823988,294921054,0.01614571499885642,445.6549504206056,2827,5691,4
+1672267516,1253890971,0.019938225999794668,463.9904522865263,2827,5691,4
+1827268706,306636851,0.006967754001379944,307.2300820908875,2827,5691,4
+408478755,1768859071,0.011055791001126636,697.8556376483256,2827,5691,4
+1574635374,600855062,0.015535171998635633,322.93290424355115,2827,5691,4
+2598983963,317766814,0.013583924999693409,296.63342740485876,2827,5691,4
+321209227,646729161,0.01865234400247573,442.53836425358986,2827,5691,4
+6807158096,3123285424,0.011086653998063412,202.045423495865,2827,5691,4
+549943301,2598987933,0.0009277470016968437,35.523732987539006,2827,5691,4
+1505052514,333265696,0.006441278997954214,226.88367088862458,2827,5691,4
+549931432,2604686222,0.002590890999272233,86.4933235550859,2827,5691,4
+318015042,288947631,0.03273827599696233,421.1855259966528,2827,5691,4
+7257113598,7031883144,0.015127848997508409,481.6685944984319,2827,5691,4
+6448459782,4016874494,0.002013528999668779,131.90751888540956,2827,5691,4
+473666790,418009807,0.015151703999435995,616.8422429539488,2827,5691,4
+2709966866,7140363810,0.01917971899820259,666.1717265390163,2827,5691,4
+4955446021,6053177179,0.00788183199983905,257.7677435214174,2827,5691,4
+574505825,7286135580,0.013873551997676259,502.49813461242684,2827,5691,4
+3152652398,2632841195,0.00022405999698094092,16.05410064430767,2827,5691,4
+6389441585,549931439,0.008416862998274155,286.0696115473284,2827,5691,4
+4955445788,2598984696,0.016510842000570847,710.6103593111196,2827,5691,4
+2635713649,34911573,0.025726518000737997,None,2827,5691,4
+2554184488,288944214,0.009566790002281778,452.6269758518667,2827,5691,4
+418009813,574496336,0.00968351999836159,488.8373405449547,2827,5691,4
+3462099513,365064191,0.003157262999593513,241.9305441128864,2827,5691,4
+4321209903,288947635,0.0024025400016398635,89.32726022221709,2827,5691,4
+2621360530,1362941667,0.008783397999650333,404.88978534474785,2827,5691,4
+2621386740,426948337,0.020809811001527123,704.90873165616,2827,5691,4
+360747463,1253890891,0.0013235480000730604,115.8616723797326,2827,5691,4
+90713483,1828418233,0.0018213900002592709,67.6729183253639,2827,5691,4
+318015042,4016874623,0.0029825359997630585,146.82532607152257,2827,5691,4
+5095519274,6001542005,0.004744697998830816,394.8821819040191,2827,5691,4
+574475518,2621506083,0.00891107200004626,296.1749244866103,2827,5691,4
+292728423,4845192812,0.008807941998384194,324.25303154204727,2827,5691,4
+7245276253,469718545,0.0072528470009274315,225.2174804198681,2827,5691,4
+2600456373,474997349,0.00926098899799399,511.11398598162265,2827,5691,4
+430534355,1830470690,4.0013997931964695e-05,3.5819980124555086,2827,5691,4
+318261957,2616315925,0.013789652999548707,478.54912090204874,2827,5691,4
+6908174001,600858234,0.02264077899963013,676.669550658477,2827,5691,4
+45217432,317839009,0.0048265280020132195,214.85683549218038,2827,5691,4
+4016874515,2598981737,0.0159348580018559,414.03216869826895,2827,5691,4
+34053772,2709164536,0.012566968001920031,611.2709913034893,2827,5691,4
+2614897350,410488856,0.012109030001738574,490.60053969987376,2827,5691,4
+574482753,7028725556,0.023951327999384375,768.0748904497931,2827,5691,4
+408478763,2612706786,0.00684419900062494,542.9635549695838,2827,5691,4
+674511701,360747493,0.00901634600086254,540.9390299817543,2827,5691,4
+549931430,2608394482,0.009636134000174934,291.48713827057804,2827,5691,4
+2613167250,405229458,0.0016435950019513257,150.98464174372822,2827,5691,4
+5576939248,2611370483,0.005573631999141071,247.59474539609872,2827,5691,4
+2696567034,5609333812,0.014546899001288693,544.8291915663265,2827,5691,4
+34053459,2605041420,0.02268625000215252,745.9962543239784,2827,5691,4
+469872413,2612700811,0.01815928400174016,531.0346088911808,2827,5691,4
+7202546042,426948337,0.003651994000392733,399.65304499593276,2827,5691,4
+508824243,317839542,0.008873923998180544,250.2341684437973,2827,5691,4
+1828269035,549920915,0.005189600000448991,229.8196777256521,2827,5691,4
+2952146882,549938445,0.003061102001083782,138.30182936835243,2827,5691,4
+317767230,7030602781,0.001412981997418683,45.661832779945314,2827,5691,4
+7030602779,600861362,0.005784600001788931,194.54897286425881,2827,5691,4
+574546116,665115012,0.01647321700147586,518.410521468413,2827,5691,4
+1988057398,2637079129,0.02519596599813667,1144.52259390045,2827,5691,4
+4955446046,7182110440,0.009428920999198454,380.9316035609116,2827,5691,4
+3211622692,318260724,0.0035589710023486987,265.28715514357395,2827,5691,4
+574457822,3111465610,0.005646713998430641,187.30089552278895,2827,5691,4
+474997016,3123285422,0.004333002998464508,238.8794603618747,2827,5691,4
+4226442919,3522264443,0.0032042519997048657,190.36745785565165,2827,5691,4
+7140363801,333265692,0.017208389999723295,666.7530396460336,2827,5691,4
+1828263512,17689717,0.025256663997424766,None,2827,5691,4
+574449258,1929118240,0.020182126998406602,529.8540594348103,2827,5691,4
+365070092,3211622686,0.00402480699995067,294.8068842064823,2827,5691,4
+574465023,2616462233,0.002440683001623256,123.32236605762252,2827,5691,4
+1362941674,7140339574,0.007318759999179747,187.11648556273997,2827,5691,4
+646729161,3123285391,0.003003529000125127,108.17611080310326,2827,5691,4
+1934201756,2554184498,0.022802662999310996,818.7191029257017,2827,5691,4
+2623041440,4955446059,0.021074513002531603,583.5139470626206,2827,5691,4
+288947629,6448462033,0.009901900997647317,410.99989791340255,2827,5691,4
+1672340376,1362941687,0.00014201799785951152,None,2827,5691,4
+6943345426,7081828735,0.019885090998286614,606.2296135599523,2827,5691,4
+317840788,318266812,0.010993509000400081,360.331834453331,2827,5691,4
+473666764,360747431,0.002763624997896841,286.04783495751815,2827,5691,4
diff --git a/evaluation/results/example/queries/charge.csv b/evaluation/results/example/queries/charge.csv
index 0870937..778a20b 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
-418009821,3211622686,0.007394672000373248,None,2828,5691,4
-687135582,1929118274,0.02638536900121835,None,2827,5691,4
-440870156,7030625397,0.008711466998647666,None,2828,5691,4
-764105827,360757816,0.07090238299861085,None,2827,5691,4
-2604687836,7172883306,0.010646309998264769,None,2828,5691,4
-1937178498,2600722212,0.005245233998721233,None,2827,5691,4
-7140363811,1362941670,0.0079917379989638,None,2828,5691,4
-408478842,549920911,0.02801381099925493,None,2827,5691,4
-2618923396,7321870100,0.02814459699948202,None,2828,5691,4
-2598983042,2600543396,0.05364455999733764,None,2827,5691,4
-6389441585,292992947,0.0213540760014439,None,2828,5691,4
-2635713649,508823988,0.0789974750005058,None,2827,5691,4
-418009801,574465015,0.038303894998534815,None,2828,5691,4
-3123285425,418009262,0.008229285998822888,None,2827,5691,4
-1672334378,6604102084,0.007330639000429073,None,2828,5691,4
-7322098545,3462099369,0.011317095999402227,None,2827,5691,4
-7321870120,687135582,0.016365256000426598,None,2828,5691,4
-1362941693,7030617904,0.026688974001444876,None,2827,5691,4
-2621386732,574449258,0.021823441002197796,None,2828,5691,4
-2608786278,2696560492,0.013737029999902006,None,2827,5691,4
-408478834,563194906,0.005817397999635432,None,2828,5691,4
-4321209901,7140363801,0.015954991002217866,None,2827,5691,4
-2360479290,2621360525,0.00667577700005495,None,2828,5691,4
-6603016876,1656016522,0.02237141499790596,None,2827,5691,4
-7031746250,7030623427,0.00909577299898956,None,2828,5691,4
-318260941,7245276256,0.026469780998013448,10154.740275174707,2827,5691,4
-318266812,574465010,0.010114702999999281,None,2828,5691,4
-2734185688,318266811,0.009515976998955011,None,2827,5691,4
-370935760,360747915,0.01755944999968051,None,2828,5691,4
-1505992709,1253890916,0.03252277499996126,None,2827,5691,4
-574482750,318015069,0.009561489001498558,None,2828,5691,4
-360747548,469718545,0.008863475999532966,None,2827,5691,4
-7286240207,748845418,0.024607080998976016,None,2828,5691,4
-7257113601,2621360552,0.009745751001901226,None,2827,5691,4
-600855077,426930266,0.03113081300034537,None,2828,5691,4
-318014995,3111465597,0.013242360997537617,None,2827,5691,4
-2360384211,318261951,0.008451453999441583,None,2828,5691,4
-7031746252,600855671,0.008894483999029035,None,2827,5691,4
-360747557,318261953,0.006288471002335427,None,2828,5691,4
-2600543577,2696567095,0.014977671002270654,None,2827,5691,4
-247326136,7286181354,0.02317222099736682,None,2828,5691,4
-2608679794,574588781,0.05112541799826431,None,2827,5691,4
-671239369,574505822,0.07076092500210507,None,2828,5691,4
-549920910,2611494644,0.017119661999458913,None,2827,5691,4
-4321209901,318014996,0.015176381999481237,None,2828,5691,4
-574567080,2598986957,0.031472970000322675,None,2827,5691,4
-5023014977,1828269031,0.006394316002115374,None,2828,5691,4
-405229450,317839975,0.013067836000118405,None,2827,5691,4
-1672267605,288944219,0.005070572002296103,None,2828,5691,4
-7247195349,360747893,0.00799208199896384,None,2827,5691,4
-7257113603,306636853,0.011083639998105355,None,2828,5691,4
-6604102084,360747507,0.039834104001784,None,2827,5691,4
-2619060548,5023014976,0.013280855000630254,None,2828,5691,4
-3152652408,418009809,0.06443841100190184,None,2827,5691,4
-2612700813,1828418194,0.017056405999028357,None,2828,5691,4
-600855068,1829747761,0.015810199998668395,None,2827,5691,4
-34053441,549931423,0.022269271001277957,None,2828,5691,4
-1827499342,2608786068,0.012049578999722144,None,2827,5691,4
-7042579827,7165728796,0.006933294000191381,None,2828,5691,4
-600852672,294919193,0.05663213200023165,None,2827,5691,4
-2604684732,2608394376,0.012743196002702462,None,2828,5691,4
-2729892258,3111465599,0.023083280000719242,None,2827,5691,4
-7286240209,317839014,0.015098163003131049,None,2828,5691,4
-2554184498,318261955,0.01033000300230924,None,2827,5691,4
-360747527,4903537220,0.006485281999630388,None,2828,5691,4
-665115010,2598982037,0.10026579600162222,None,2827,5691,4
-549914986,2604688050,0.014653941001597559,None,2828,5691,4
-7321902560,7202546043,0.07977296600074624,None,2827,5691,4
-2952146882,7247195349,0.013828422001097351,None,2828,5691,4
-7042580419,2608678794,0.005124851999426028,None,2827,5691,4
-7286240203,4016874623,0.01710126800026046,None,2828,5691,4
-1672334354,600861115,0.006956539997190703,None,2827,5691,4
-2614920443,3111465611,0.03844647200094187,None,2828,5691,4
-360747578,574485682,0.00569783299943083,None,2827,5691,4
-2734185688,4903549431,0.009836854002060136,None,2828,5691,4
-2631500008,1830470676,0.07079098200119915,None,2827,5691,4
-1867147170,1828269031,0.024032836998230778,None,2828,5691,4
-5113940072,321209222,0.00842946199918515,None,2827,5691,4
-318260732,317839537,0.028799880998121807,None,2828,5691,4
-1574635372,288943146,0.005358062997402158,None,2827,5691,4
-5609333814,3177732288,0.016075297000497812,None,2828,5691,4
-294919195,2639898838,0.009441927999432664,None,2827,5691,4
-7042580417,435112933,0.0049728350022633094,None,2828,5691,4
-1672340374,6448461991,0.02116352400116739,None,2827,5691,4
-508823963,1929118187,0.011777966999943601,None,2828,5691,4
-1368670342,574449298,0.006581884001207072,None,2827,5691,4
-1828400048,1362941672,0.006938153001101455,None,2828,5691,4
-4016874408,288944220,0.07267897600104334,None,2827,5691,4
-1672267709,473666786,0.006804332999308826,None,2828,5691,4
-7286181353,4475742630,0.03176952099966002,None,2827,5691,4
-549928583,1820309648,0.014391001997864805,None,2828,5691,4
-2701813226,4955446072,0.008205933998397086,None,2827,5691,4
-408478826,7286240207,0.007648313003301155,None,2828,5691,4
-473666774,292484328,0.009424661002412904,None,2827,5691,4
-7165728799,7115183091,0.032611395999992965,None,2828,5691,4
-2635713654,4955446028,0.06316470999809098,None,2827,5691,4
-5113940036,1293287346,0.005928680999204516,None,2828,5691,4
-1672267690,7286135545,0.0049598719997447915,None,2827,5691,4
-574457817,1672334393,0.02312618300129543,None,2828,5691,4
-3111465608,410486365,0.031250187999830814,None,2827,5691,4
+2598984220,317431286,0.008180176002497319,None,2828,5691,4
+1574635376,2608394376,0.021258028002193896,None,2827,5691,4
+292485282,2639932980,0.013505564998922637,None,2828,5691,4
+7115183090,49109518,0.06775778799783438,None,2827,5691,4
+563188714,2616315920,0.005833523002365837,None,2828,5691,4
+2705157118,3299068955,0.007134575000236509,None,2827,5691,4
+3462099369,1935264851,0.007206661000964232,None,2828,5691,4
+1827520760,1927634075,0.018673054000828415,None,2827,5691,4
+7286135582,318014975,0.018709760002820985,None,2828,5691,4
+1949865714,1929118103,0.005620900003123097,None,2827,5691,4
+7321855875,7286135544,0.005817837998620234,None,2828,5691,4
+7031746253,1362941693,0.006871140998555347,None,2827,5691,4
+549928581,7042580423,0.02950502699968638,None,2828,5691,4
+306636859,3123285393,0.012904035997053143,None,2827,5691,4
+1828263505,7245276253,0.010383671997260535,None,2828,5691,4
+3111465609,333265684,0.015193104001809843,None,2827,5691,4
+574465020,7158827509,0.012436743996659061,50.69540952494169,2828,5691,4
+4955446038,2701786783,0.005120448000525357,None,2827,5691,4
+1505057722,2598982820,0.020811553000385175,None,2828,5691,4
+6417387121,45217575,0.013508068001101492,None,2827,5691,4
+3307706690,2608500686,0.005230446000496158,None,2828,5691,4
+508823988,294921054,0.010769991000415757,None,2827,5691,4
+1672267516,1253890971,0.004756539001391502,None,2828,5691,4
+1827268706,306636851,0.02145381899754284,None,2827,5691,4
+408478755,1768859071,0.0048011839971877635,None,2828,5691,4
+1574635374,600855062,0.004588548999890918,None,2827,5691,4
+2598983963,317766814,0.03134544000204187,None,2828,5691,4
+321209227,646729161,0.012163670999143505,None,2827,5691,4
+6807158096,3123285424,0.015652748999855248,None,2828,5691,4
+549943301,2598987933,0.02455500900032348,35.523732987539006,2827,5691,4
+1505052514,333265696,0.007645136000064667,None,2828,5691,4
+549931432,2604686222,0.012557174999528797,None,2827,5691,4
+318015042,288947631,0.013099121999402996,None,2828,5691,4
+7257113598,7031883144,0.014018231002410175,None,2827,5691,4
+6448459782,4016874494,0.04255742100212956,131.90751888540956,2828,5691,4
+473666790,418009807,0.01084802699915599,None,2827,5691,4
+2709966866,7140363810,0.006677566001599189,None,2828,5691,4
+4955446021,6053177179,0.0077450270000554156,None,2827,5691,4
+574505825,7286135580,0.014772022001125151,None,2828,5691,4
+3152652398,2632841195,0.007683657000598032,16.05410064430767,2827,5691,4
+6389441585,549931439,0.026403526000649435,None,2828,5691,4
+4955445788,2598984696,0.00579772499986575,None,2827,5691,4
+2635713649,34911573,0.06317204700098955,None,2828,5691,4
+2554184488,288944214,0.008746649000386242,None,2827,5691,4
+418009813,574496336,0.0061847219985793345,None,2828,5691,4
+3462099513,365064191,0.02295334200243815,None,2827,5691,4
+4321209903,288947635,0.026310897002986167,None,2828,5691,4
+2621360530,1362941667,0.00589794200277538,None,2827,5691,4
+2621386740,426948337,0.007500421997974627,None,2828,5691,4
+360747463,1253890891,0.014226000999769894,None,2827,5691,4
+90713483,1828418233,0.013401329000771511,67.6729183253639,2828,5691,4
+318015042,4016874623,0.027334361999237444,None,2827,5691,4
+5095519274,6001542005,0.017446650999772828,None,2828,5691,4
+574475518,2621506083,0.022026691000064602,None,2827,5691,4
+292728423,4845192812,0.009922258002916351,None,2828,5691,4
+7245276253,469718545,0.05542676899858634,None,2827,5691,4
+2600456373,474997349,0.027136166998388944,None,2828,5691,4
+430534355,1830470690,0.005587194998952327,3.5819980124555086,2827,5691,4
+318261957,2616315925,0.007042051001917571,None,2828,5691,4
+6908174001,600858234,0.009862457001872826,None,2827,5691,4
+45217432,317839009,0.014329842000734061,None,2828,5691,4
+4016874515,2598981737,0.05928631699862308,None,2827,5691,4
+34053772,2709164536,0.019356193002749933,None,2828,5691,4
+2614897350,410488856,0.024427955999271944,None,2827,5691,4
+574482753,7028725556,0.00775097400037339,None,2828,5691,4
+408478763,2612706786,0.005300780998368282,None,2827,5691,4
+674511701,360747493,0.0075798539983225055,None,2828,5691,4
+549931430,2608394482,0.028289874997426523,None,2827,5691,4
+2613167250,405229458,0.008100540002487833,None,2828,5691,4
+5576939248,2611370483,0.01708006900298642,None,2827,5691,4
+2696567034,5609333812,0.008594047001679428,None,2828,5691,4
+34053459,2605041420,0.005617404000076931,None,2827,5691,4
+469872413,2612700811,0.0057720000004337635,None,2828,5691,4
+7202546042,426948337,0.021323707998817554,None,2827,5691,4
+508824243,317839542,0.015900566999334842,None,2828,5691,4
+1828269035,549920915,0.006274672003200976,None,2827,5691,4
+2952146882,549938445,0.01221945900033461,None,2828,5691,4
+317767230,7030602781,0.02184277600099449,45.661832779945314,2827,5691,4
+7030602779,600861362,0.07216341800085502,None,2828,5691,4
+574546116,665115012,0.013652434001414804,None,2827,5691,4
+1988057398,2637079129,0.005324505000317004,None,2828,5691,4
+4955446046,7182110440,0.0063468920016021,None,2827,5691,4
+3211622692,318260724,0.014908343997376505,None,2828,5691,4
+574457822,3111465610,0.02582829099992523,None,2827,5691,4
+474997016,3123285422,0.022026119000656763,None,2828,5691,4
+4226442919,3522264443,0.01695801899768412,None,2827,5691,4
+7140363801,333265692,0.005513084997801343,None,2828,5691,4
+1828263512,17689717,0.009005162999528693,None,2827,5691,4
+574449258,1929118240,0.02272072200139519,None,2828,5691,4
+365070092,3211622686,0.02208552999945823,None,2827,5691,4
+574465023,2616462233,0.018754356999124866,123.32236605762252,2828,5691,4
+1362941674,7140339574,0.0625884090004547,None,2827,5691,4
+646729161,3123285391,0.010390056999312947,None,2828,5691,4
+1934201756,2554184498,0.0054623450014332775,None,2827,5691,4
+2623041440,4955446059,0.024829889996908605,None,2828,5691,4
+288947629,6448462033,0.009179304997815052,None,2827,5691,4
+1672340376,1362941687,0.005026917999202851,None,2828,5691,4
+6943345426,7081828735,0.009698408000986092,None,2827,5691,4
+317840788,318266812,0.06360204099837574,None,2828,5691,4
+473666764,360747431,0.02410455099743558,None,2827,5691,4
diff --git a/evaluation/results/example/queries/classic.csv b/evaluation/results/example/queries/classic.csv
index e07a54f..0e3c393 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
-418009821,3211622686,0.0013996090019645635,299.53940761745315,2827,5691,4,0
-687135582,1929118274,0.0027741980011342093,309.984257120316,2827,5691,4,0
-440870156,7030625397,0.0013487069991242606,266.8755777965704,2827,5691,4,0
-764105827,360757816,0.004459169002075214,363.03519416670315,2827,5691,4,0
-2604687836,7172883306,0.0016282090000458993,235.90323152184388,2827,5691,4,0
-1937178498,2600722212,0.0022592390014324337,826.6488628265173,2827,5691,4,0
-7140363811,1362941670,0.0006039979998604394,112.06217872199922,2827,5691,4,0
-408478842,549920911,0.0038798409987066407,619.5302552884552,2827,5691,4,0
-2618923396,7321870100,0.004853054000705015,344.33164889729017,2827,5691,4,0
-2598983042,2600543396,0.0021739570001955144,154.51239134256772,2827,5691,4,0
-6389441585,292992947,0.0020658209978137165,153.9857116374839,2827,5691,4,0
-2635713649,508823988,0.000592380001762649,53.38509628553214,2827,5691,4,0
-418009801,574465015,0.006562303002283443,527.1319006025898,2827,5691,4,0
-3123285425,418009262,0.005901103999349289,423.7599548271774,2827,5691,4,0
-1672334378,6604102084,5.61460001335945e-05,None,2827,5691,4,0
-7322098545,3462099369,0.002584097001090413,288.4592989060882,2827,5691,4,0
-7321870120,687135582,0.004516453001997434,419.35494759758376,2827,5691,4,0
-1362941693,7030617904,0.0023954780008352827,237.46407404483605,2827,5691,4,0
-2621386732,574449258,0.0034764320007525384,417.7439980535539,2827,5691,4,0
-2608786278,2696560492,0.005055075002019294,517.8714975683342,2827,5691,4,0
-408478834,563194906,0.000448023001808906,258.9848957044358,2827,5691,4,0
-4321209901,7140363801,0.005401580998295685,566.2186955636021,2827,5691,4,0
-2360479290,2621360525,0.002046346002316568,367.192459628314,2827,5691,4,0
-6603016876,1656016522,0.0037472309995791875,792.3742000871882,2827,5691,4,0
-7031746250,7030623427,0.005528460998903029,703.1864446314731,2827,5691,4,0
-318260941,7245276256,0.0003430129982007202,48.451769744859156,2827,5691,4,0
-318266812,574465010,0.0011769879965868313,177.57906338443627,2827,5691,4,0
-2734185688,318266811,0.001332489999185782,251.8290305630775,2827,5691,4,0
-370935760,360747915,0.002013821998843923,252.2380450378266,2827,5691,4,0
-1505992709,1253890916,0.002365492000535596,250.9143336993809,2827,5691,4,0
-574482750,318015069,0.0013935230017523281,206.1122097057147,2827,5691,4,0
-360747548,469718545,8.829500075080432e-05,None,2827,5691,4,0
-7286240207,748845418,0.0038438489973486867,466.32838207409696,2827,5691,4,0
-7257113601,2621360552,0.001232238002558006,280.2626114105422,2827,5691,4,0
-600855077,426930266,0.0034775059975800104,341.5483793234692,2827,5691,4,0
-318014995,3111465597,0.00023414699899149127,114.39171887865092,2827,5691,4,0
-2360384211,318261951,0.005682368002453586,645.4157811529808,2827,5691,4,0
-7031746252,600855671,0.003615891997469589,523.4061339411232,2827,5691,4,0
-360747557,318261953,8.017400250537321e-05,None,2827,5691,4,0
-2600543577,2696567095,0.0005319150004652329,110.10425255510617,2827,5691,4,0
-247326136,7286181354,0.00012853699809056707,None,2827,5691,4,0
-2608679794,574588781,0.0050784160011971835,398.6061493763712,2827,5691,4,0
-671239369,574505822,0.005494400000316091,504.481438611962,2827,5691,4,0
-549920910,2611494644,0.0010300610010745004,107.9361662137449,2827,5691,4,0
-4321209901,318014996,0.0019231379992561415,232.0745739049763,2827,5691,4,0
-574567080,2598986957,0.0004245489981258288,69.05491249038947,2827,5691,4,0
-5023014977,1828269031,0.005051388001447776,591.3147075714494,2827,5691,4,0
-405229450,317839975,0.005466245998832164,389.3299727634748,2827,5691,4,0
-1672267605,288944219,6.430299981730059e-05,None,2827,5691,4,0
-7247195349,360747893,0.01183563700033119,None,2827,5691,4,0
-7257113603,306636853,0.004348680999100907,437.05718284325974,2827,5691,4,0
-6604102084,360747507,0.003575891998480074,225.63308448102424,2827,5691,4,0
-2619060548,5023014976,0.007065489000524394,684.1927186887414,2827,5691,4,0
-3152652408,418009809,0.0049040140002034605,356.9359172377983,2827,5691,4,0
-2612700813,1828418194,0.00457955099773244,404.9649358227012,2827,5691,4,0
-600855068,1829747761,0.0036690670021926053,321.4304820539351,2827,5691,4,0
-34053441,549931423,0.0038769790007791016,330.7515498416791,2827,5691,4,0
-1827499342,2608786068,0.0013501140019798186,157.0355576542001,2827,5691,4,0
-7042579827,7165728796,0.002706269999180222,439.48176347319736,2827,5691,4,0
-600852672,294919193,0.002174623998143943,194.60045978800466,2827,5691,4,0
-2604684732,2608394376,0.001572477998706745,225.67874677578376,2827,5691,4,0
-2729892258,3111465599,0.004529039997578366,636.1250774293167,2827,5691,4,0
-7286240209,317839014,0.001606638998055132,215.53051978929957,2827,5691,4,0
-2554184498,318261955,0.002612239000882255,368.4077854834947,2827,5691,4,0
-360747527,4903537220,0.002028591999987839,308.9247309449616,2827,5691,4,0
-665115010,2598982037,0.004761821001011413,375.10086789924367,2827,5691,4,0
-549914986,2604688050,0.005148952001036378,406.62789799724936,2827,5691,4,0
-7321902560,7202546043,0.005814127998746699,647.8841126042021,2827,5691,4,0
-2952146882,7247195349,0.00411353399977088,284.15726187079684,2827,5691,4,0
-7042580419,2608678794,0.003958449000492692,698.3454072097257,2827,5691,4,0
-7286240203,4016874623,0.00090085400006501,165.24731610205183,2827,5691,4,0
-1672334354,600861115,0.005391890001192223,770.4024309119364,2827,5691,4,0
-2614920443,3111465611,0.0014134039993223269,177.8696047315475,2827,5691,4,0
-360747578,574485682,7.005400038906373e-05,None,2827,5691,4,0
-2734185688,4903549431,0.002963183000247227,439.4930627514446,2827,5691,4,0
-2631500008,1830470676,0.003986423998867394,357.51214838441797,2827,5691,4,0
-1867147170,1828269031,0.0026679650000005495,436.3097512530265,2827,5691,4,0
-5113940072,321209222,0.00030585299828089774,84.32254165537744,2827,5691,4,0
-318260732,317839537,0.0005251059992588125,69.7984740636073,2827,5691,4,0
-1574635372,288943146,9.370200132252648e-05,None,2827,5691,4,0
-5609333814,3177732288,0.002770126000541495,368.10345899843935,2827,5691,4,0
-294919195,2639898838,0.0006389840018528048,140.21450329712175,2827,5691,4,0
-7042580417,435112933,0.0016580880001129117,535.8777439426531,2827,5691,4,0
-1672340374,6448461991,0.0018710289987211581,286.2837684453694,2827,5691,4,0
-508823963,1929118187,0.005727465002564713,625.7948384834564,2827,5691,4,0
-1368670342,574449298,0.004086169999936828,289.11487947498966,2827,5691,4,0
-1828400048,1362941672,0.0011229840019950643,490.31985636850595,2827,5691,4,0
-4016874408,288944220,0.0020364219999464694,235.07185286856708,2827,5691,4,0
-1672267709,473666786,0.004738738000014564,408.9790017628481,2827,5691,4,0
-7286181353,4475742630,0.002411451998341363,335.2071411763051,2827,5691,4,0
-549928583,1820309648,0.0037011620006524026,287.5714344469538,2827,5691,4,0
-2701813226,4955446072,0.0003865350008709356,270.90837236452404,2827,5691,4,0
-408478826,7286240207,0.005303846999595407,654.9357242070321,2827,5691,4,0
-473666774,292484328,0.00626982600078918,None,2827,5691,4,0
-7165728799,7115183091,0.00038769900129409507,88.19239151226196,2827,5691,4,0
-2635713654,4955446028,0.0020243799990566913,125.05689399557589,2827,5691,4,0
-5113940036,1293287346,0.003832612001133384,399.1991755729142,2827,5691,4,0
-1672267690,7286135545,4.598400118993595e-05,None,2827,5691,4,0
-574457817,1672334393,0.011462941998615861,821.5688985611807,2827,5691,4,0
-3111465608,410486365,0.0036238719985703938,389.0809006977434,2827,5691,4,0
+2598984220,317431286,0.008187216997612268,498.1140111598792,2827,5691,4,0
+1574635376,2608394376,0.0001609639984962996,None,2827,5691,4,0
+292485282,2639932980,0.0068304070009617135,288.6212594295983,2827,5691,4,0
+7115183090,49109518,0.01066912700116518,904.9345063361109,2827,5691,4,0
+563188714,2616315920,0.002552830999775324,441.49586624662686,2827,5691,4,0
+2705157118,3299068955,0.004320370997447753,344.81142283925794,2827,5691,4,0
+3462099369,1935264851,0.010293547999026487,1063.5350428566937,2827,5691,4,0
+1827520760,1927634075,0.0001419260006514378,None,2827,5691,4,0
+7286135582,318014975,0.0028860759994131513,291.32161516417983,2827,5691,4,0
+1949865714,1929118103,0.0070300959996529855,247.41047878926767,2827,5691,4,0
+7321855875,7286135544,0.0018392879974271636,203.13436437693898,2827,5691,4,0
+7031746253,1362941693,0.0038844900009280536,567.6960773066983,2827,5691,4,0
+549928581,7042580423,0.00968421200013836,652.1459029950373,2827,5691,4,0
+306636859,3123285393,0.0006229690006875899,134.30855985472655,2827,5691,4,0
+1828263505,7245276253,0.0019597450009314343,172.3946058972845,2827,5691,4,0
+3111465609,333265684,0.0010656390004442073,158.3747300421578,2827,5691,4,0
+574465020,7158827509,0.00021219200061750598,50.69540952494169,2827,5691,4,0
+4955446038,2701786783,0.00809012800164055,474.42019948624187,2827,5691,4,0
+1505057722,2598982820,0.0011639390031632502,213.63162923041278,2827,5691,4,0
+6417387121,45217575,0.005168483003217261,511.57995760781023,2827,5691,4,0
+3307706690,2608500686,0.008918706997064874,704.3773911683422,2827,5691,4,0
+508823988,294921054,0.009191697998176096,445.6549504206056,2827,5691,4,0
+1672267516,1253890971,0.008897299001546344,463.9904522865263,2827,5691,4,0
+1827268706,306636851,0.004441869998117909,307.2300820908875,2827,5691,4,0
+408478755,1768859071,0.008488208000926534,697.8556376483256,2827,5691,4,0
+1574635374,600855062,0.0059117839991813526,322.93290424355115,2827,5691,4,0
+2598983963,317766814,0.002923186002590228,296.63342740485876,2827,5691,4,0
+321209227,646729161,0.005924624001636403,442.53836425358986,2827,5691,4,0
+6807158096,3123285424,0.002905574998294469,202.045423495865,2827,5691,4,0
+549943301,2598987933,0.00014319199908641167,35.523732987539006,2827,5691,4,0
+1505052514,333265696,0.0012539979979919735,226.88367088862458,2827,5691,4,0
+549931432,2604686222,0.0004224229996907525,86.4933235550859,2827,5691,4,0
+318015042,288947631,0.007451342997228494,421.1855259966528,2827,5691,4,0
+7257113598,7031883144,0.0058611109998309985,481.6685944984319,2827,5691,4,0
+6448459782,4016874494,0.0007582449979963712,131.90751888540956,2827,5691,4,0
+473666790,418009807,0.009337532999779796,616.8422429539488,2827,5691,4,0
+2709966866,7140363810,0.005812201998196542,666.1717265390163,2827,5691,4,0
+4955446021,6053177179,0.003093438997893827,257.7677435214174,2827,5691,4,0
+574505825,7286135580,0.007588347998535028,502.49813461242684,2827,5691,4,0
+3152652398,2632841195,0.00013957900227978826,16.05410064430767,2827,5691,4,0
+6389441585,549931439,0.003053469001315534,286.0696115473284,2827,5691,4,0
+4955445788,2598984696,0.005824555999424774,710.6103593111196,2827,5691,4,0
+2635713649,34911573,0.00760829299906618,None,2827,5691,4,0
+2554184488,288944214,0.0030421629999182187,452.6269758518667,2827,5691,4,0
+418009813,574496336,0.005539825997402659,488.8373405449547,2827,5691,4,0
+3462099513,365064191,0.003426727998885326,241.9305441128864,2827,5691,4,0
+4321209903,288947635,0.0005009640008211136,89.32726022221709,2827,5691,4,0
+2621360530,1362941667,0.0029625880015373696,404.88978534474785,2827,5691,4,0
+2621386740,426948337,0.005256820000795415,704.90873165616,2827,5691,4,0
+360747463,1253890891,0.0007362549986282829,115.8616723797326,2827,5691,4,0
+90713483,1828418233,0.0006892179990245495,67.6729183253639,2827,5691,4,0
+318015042,4016874623,0.0008180189979611896,146.82532607152257,2827,5691,4,0
+5095519274,6001542005,0.002089203000650741,394.8821819040191,2827,5691,4,0
+574475518,2621506083,0.002484353000909323,296.1749244866103,2827,5691,4,0
+292728423,4845192812,0.003259769997384865,324.25303154204727,2827,5691,4,0
+7245276253,469718545,0.002734369998506736,225.2174804198681,2827,5691,4,0
+2600456373,474997349,0.0027447590000519995,511.11398598162265,2827,5691,4,0
+430534355,1830470690,3.051900057471357e-05,3.5819980124555086,2827,5691,4,0
+318261957,2616315925,0.004263339000317501,478.54912090204874,2827,5691,4,0
+6908174001,600858234,0.005954239000857342,676.669550658477,2827,5691,4,0
+45217432,317839009,0.002452248001645785,214.85683549218038,2827,5691,4,0
+4016874515,2598981737,0.00666467399787507,414.03216869826895,2827,5691,4,0
+34053772,2709164536,0.0038947239991102833,611.2709913034893,2827,5691,4,0
+2614897350,410488856,0.004972164999344386,490.60053969987376,2827,5691,4,0
+574482753,7028725556,0.0061100989987608045,768.0748904497931,2827,5691,4,0
+408478763,2612706786,0.0038842629983264487,542.9635549695838,2827,5691,4,0
+674511701,360747493,0.002431435998005327,540.9390299817543,2827,5691,4,0
+549931430,2608394482,0.004227809997246368,291.48713827057804,2827,5691,4,0
+2613167250,405229458,0.0005703520000679418,150.98464174372822,2827,5691,4,0
+5576939248,2611370483,0.0018948460019601043,247.59474539609872,2827,5691,4,0
+2696567034,5609333812,0.004291510002076393,544.8291915663265,2827,5691,4,0
+34053459,2605041420,0.005893408000702038,745.9962543239784,2827,5691,4,0
+469872413,2612700811,0.0068368920001375955,531.0346088911808,2827,5691,4,0
+7202546042,426948337,0.0013824410016241018,399.65304499593276,2827,5691,4,0
+508824243,317839542,0.002436760998534737,250.2341684437973,2827,5691,4,0
+1828269035,549920915,0.0024375350003538188,229.8196777256521,2827,5691,4,0
+2952146882,549938445,0.0009131609986070544,138.30182936835243,2827,5691,4,0
+317767230,7030602781,0.00046262300020316616,45.661832779945314,2827,5691,4,0
+7030602779,600861362,0.001837858999351738,194.54897286425881,2827,5691,4,0
+574546116,665115012,0.004715062001196202,518.410521468413,2827,5691,4,0
+1988057398,2637079129,0.0065310130012221634,1144.52259390045,2827,5691,4,0
+4955446046,7182110440,0.003659085999970557,380.9316035609116,2827,5691,4,0
+3211622692,318260724,0.002272661997267278,265.28715514357395,2827,5691,4,0
+574457822,3111465610,0.0018534789996920153,187.30089552278895,2827,5691,4,0
+474997016,3123285422,0.0019756779984163586,238.8794603618747,2827,5691,4,0
+4226442919,3522264443,0.0014297010020527523,190.36745785565165,2827,5691,4,0
+7140363801,333265692,0.004980473000614438,666.7530396460336,2827,5691,4,0
+1828263512,17689717,0.005680689002474537,None,2827,5691,4,0
+574449258,1929118240,0.00564690899773268,529.8540594348103,2827,5691,4,0
+365070092,3211622686,0.0010198710006079637,294.8068842064823,2827,5691,4,0
+574465023,2616462233,0.0006938559999980498,123.32236605762252,2827,5691,4,0
+1362941674,7140339574,0.0022993179991317447,187.11648556273997,2827,5691,4,0
+646729161,3123285391,0.0009296719981648494,108.17611080310326,2827,5691,4,0
+1934201756,2554184498,0.0068787950003752485,818.7191029257017,2827,5691,4,0
+2623041440,4955446059,0.005505220000486588,583.5139470626206,2827,5691,4,0
+288947629,6448462033,0.004556083000352373,410.99989791340255,2827,5691,4,0
+1672340376,1362941687,5.44440008525271e-05,None,2827,5691,4,0
+6943345426,7081828735,0.006068169997888617,606.2296135599523,2827,5691,4,0
+317840788,318266812,0.003152984001644654,360.331834453331,2827,5691,4,0
+473666764,360747431,0.0013173730003472883,286.04783495751815,2827,5691,4,0
diff --git a/evaluation/results/example/queries/gasstation.csv b/evaluation/results/example/queries/gasstation.csv
index ee68a1e..049b294 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
-418009821,3211622686,0.03971134799940046,299.53940761745315,2827,5691,3,0.03543409100166173,0.00014352400103234686
-687135582,1929118274,0.041116019994660746,309.984257120316,2827,5691,3,0.03201537799759535,0.0001761109997460153
-440870156,7030625397,0.03368405099899974,266.8755777965704,2827,5691,3,0.030198579999705544,0.00012722099927486852
-764105827,360757816,0.04117771200253628,363.03519416670315,2827,5691,3,0.030557096000848105,0.00012690999938058667
-2604687836,7172883306,0.034263761997863185,235.90323152184388,2827,5691,3,0.030122082000161754,0.00012745999993057922
-1937178498,2600722212,0.10552876600559102,None,2827,5691,3,0.02993848600090132,0.00012885600153822452
-7140363811,1362941670,0.03193934299633838,112.06217872199922,2827,5691,3,0.03002292199744261,0.00012902899834443815
-408478842,549920911,0.1268590639992908,13626.801256834533,2827,5691,3,0.030330719997436972,0.000127658000565134
-2618923396,7321870100,0.042453293997823494,344.33164889729017,2827,5691,3,0.030177893000654876,0.00013027100067120045
-2598983042,2600543396,0.033794486000260804,154.51239134256772,2827,5691,3,0.03039327599981334,0.00013012499766773544
-6389441585,292992947,0.034547242994449334,153.9857116374839,2827,5691,3,0.0303600049992383,0.00012920699737151153
-2635713649,508823988,0.031323860996053554,53.38509628553214,2827,5691,3,0.03014250599881052,0.00012904499817523174
-418009801,574465015,0.04715528799715685,527.1319006025898,2827,5691,3,0.03058647499710787,0.0001282580014958512
-3123285425,418009262,0.053072014001372736,423.7599548271774,2827,5691,3,0.03457275400069193,0.0001291330008825753
-1672334378,6604102084,0.03086878300382523,None,2827,5691,3,0.03051345600033528,0.00012976500147487968
-7322098545,3462099369,0.03927982700042776,288.4592989060882,2827,5691,3,0.03069151999807218,0.00012953999976161867
-7321870120,687135582,0.043919865995121654,419.35494759758376,2827,5691,3,0.03035032899788348,0.00012984799832338467
-1362941693,7030617904,0.03898940699946252,237.46407404483605,2827,5691,3,0.0306953710023663,0.00013015699732932262
-2621386732,574449258,0.038652525003271876,417.7439980535539,2827,5691,3,0.030533116001606686,0.00016304500240948983
-2608786278,2696560492,0.048895170002651867,517.8714975683342,2827,5691,3,0.029893356000684435,0.00012798700117855333
-408478834,563194906,0.032431245999759994,258.9848957044358,2827,5691,3,0.030688322000059998,0.0001280369979212992
-4321209901,7140363801,0.0517607069996302,566.2186955636021,2827,5691,3,0.03043133100072737,0.000129722997371573
-2360479290,2621360525,0.03767592900112504,367.192459628314,2827,5691,3,0.030590771999413846,0.00012922800306114368
-6603016876,1656016522,0.1393106670002453,63388.12730872199,2827,5691,3,0.02991905200178735,0.000128541996673448
-7031746250,7030623427,0.14252788899830193,16478.057415527015,2827,5691,3,0.0314953119996062,0.00017667999782133847
-318260941,7245276256,0.03268953400402097,48.451769744859156,2827,5691,3,0.031695514000603,0.00012923800022690557
-318266812,574465010,0.03427428099894314,177.57906338443627,2827,5691,3,0.03181013599896687,0.0001294089997827541
-2734185688,318266811,0.03555490099824965,251.8290305630775,2827,5691,3,0.0317217179981526,0.00012947499999427237
-370935760,360747915,0.03692800300268573,252.2380450378266,2827,5691,3,0.03126133600017056,0.00012888100172858685
-1505992709,1253890916,0.03951858800428454,250.9143336993809,2827,5691,3,0.03122752200215473,0.00012940799933858216
-574482750,318015069,0.049795288003224414,206.1122097057147,2827,5691,3,0.041745798000192735,0.00024079600188997574
-360747548,469718545,0.05493151799964835,None,2827,5691,3,0.05426115999944159,0.0001487890003772918
-7286240207,748845418,0.06227585000306135,466.32838207409696,2827,5691,3,0.04613684400101192,0.00016804800179670565
-7257113601,2621360552,0.05430245300158276,280.2626114105422,2827,5691,3,0.0450281379999069,0.00025583200113032945
-600855077,426930266,0.0580085190013051,341.5483793234692,2827,5691,3,0.04271793299994897,0.00019419900127104484
-318014995,3111465597,0.034548407998954644,114.39171887865092,2827,5691,3,0.03354159599984996,0.0001751849995343946
-2360384211,318261951,0.21338124900285038,18108.386529444633,2827,5691,3,0.056711338002060074,0.00024542800019844435
-7031746252,600855671,0.04721380299815792,523.4061339411232,2827,5691,3,0.0336909409998043,0.0001297409980907105
-360747557,318261953,0.03293291199952364,None,2827,5691,3,0.03238073799730046,0.0001303690005443059
-2600543577,2696567095,0.054278717005217914,110.10425255510617,2827,5691,3,0.05024605900325696,0.00023517300360254012
-247326136,7286181354,0.06719713499842328,None,2827,5691,3,0.06443728800149984,0.0005071029991086107
-2608679794,574588781,0.09806302999641048,398.6061493763712,2827,5691,3,0.06396640199818648,0.0002476330009812955
-671239369,574505822,0.1034236570012581,504.481438611962,2827,5691,3,0.06487951300005079,0.0002373610004724469
-549920910,2611494644,0.06265640199853806,107.9361662137449,2827,5691,3,0.05593216399938683,0.0002369780013395939
-4321209901,318014996,0.08037789100126247,232.0745739049763,2827,5691,3,0.06426401800126769,0.0002536940010031685
-574567080,2598986957,0.06852550999974483,69.05491249038947,2827,5691,3,0.06604722900010529,0.0002452400003676303
-5023014977,1828269031,0.08623060599711607,591.3147075714494,2827,5691,3,0.06425736199889798,0.0002456229995004833
-405229450,317839975,0.08107302700227592,389.3299727634748,2827,5691,3,0.056484812001144746,0.00017385899991495535
-1672267605,288944219,0.06525450799745158,None,2827,5691,3,0.06483682899852283,0.0002586779992270749
-7247195349,360747893,0.11555830600264017,None,2827,5691,3,0.06192747000022791,0.00023622099979547784
-7257113603,306636853,0.06893787400258589,437.05718284325974,2827,5691,3,0.0512184140025056,0.00024490699797752313
-6604102084,360747507,0.07068060799429077,225.63308448102424,2827,5691,3,0.06306631199913681,0.00024151699835783802
-2619060548,5023014976,0.27588241399644176,14905.031566997151,2827,5691,3,0.06539607099693967,0.0002431680004519876
-3152652408,418009809,0.08421416099736234,356.9359172377983,2827,5691,3,0.05875403599929996,0.00026059399897349067
-2612700813,1828418194,0.09153270300157601,404.9649358227012,2827,5691,3,0.0668452169993543,0.000146112000948051
-600855068,1829747761,0.0831541859988647,321.4304820539351,2827,5691,3,0.06304372500017053,0.0002633260010043159
-34053441,549931423,0.078997396001796,330.7515498416791,2827,5691,3,0.058843540002271766,0.00028104900047765113
-1827499342,2608786068,0.051722095002332935,157.0355576542001,2827,5691,3,0.04800729600174236,0.00012919700020574965
-7042579827,7165728796,0.04289498599609942,439.48176347319736,2827,5691,3,0.03334624899798655,0.00013077399853500538
-600852672,294919193,0.039091904003726086,194.60045978800466,2827,5691,3,0.03274778600098216,0.00013169500016374514
-2604684732,2608394376,0.036897674999636365,225.67874677578376,2827,5691,3,0.03257580900026369,0.00013031599883106537
-2729892258,3111465599,0.1259958699993149,10924.156913602961,2827,5691,3,0.031968893999874126,0.00013139799921191297
-7286240209,317839014,0.03704047900100704,215.53051978929957,2827,5691,3,0.031313393999880645,0.00020388200209708884
-2554184498,318261955,0.04189028299879283,368.4077854834947,2827,5691,3,0.03239856700020027,0.00013131899686413817
-360747527,4903537220,0.036187873000017134,308.9247309449616,2827,5691,3,0.03173364599933848,0.00014875700071570463
-665115010,2598982037,0.04786528799741063,375.10086789924367,2827,5691,3,0.03247344099872862,0.00013092699737171642
-549914986,2604688050,0.0441895649964863,406.62789799724936,2827,5691,3,0.030538882998371264,0.00015087199790286832
-7321902560,7202546043,0.12691027599794324,8888.851630334015,2827,5691,3,0.030383063000044785,0.00014053099948796444
-2952146882,7247195349,0.04152610000164714,284.15726187079684,2827,5691,3,0.03266827300103614,0.00013098799900035374
-7042580419,2608678794,0.125522930004081,17665.126921975858,2827,5691,3,0.03342519000216271,0.00020709900127258152
-7286240203,4016874623,0.03501324500030023,165.24731610205183,2827,5691,3,0.031799454998690635,0.00012828300168621354
-1672334354,600861115,0.12522544000239577,34396.85983706267,2827,5691,3,0.03160597600071924,0.0001298140014114324
-2614920443,3111465611,0.036266422997869086,177.8696047315475,2827,5691,3,0.03174623299855739,0.00013387799845077097
-360747578,574485682,0.032085814000311075,None,2827,5691,3,0.03164120200017351,0.00013079400014248677
-2734185688,4903549431,0.04110447099810699,439.4930627514446,2827,5691,3,0.03219362999880104,0.00013081200086162426
-2631500008,1830470676,0.042929980998451356,357.51214838441797,2827,5691,3,0.03164305799873546,0.00012770999819622375
-1867147170,1828269031,0.03888364200247452,436.3097512530265,2827,5691,3,0.030405182998947566,0.00014394800018635578
-5113940072,321209222,0.030624800998339197,84.32254165537744,2827,5691,3,0.029911415997048607,0.00017876600031740963
-318260732,317839537,0.03183336800066172,69.7984740636073,2827,5691,3,0.030362279001565184,0.0001288800012844149
-1574635372,288943146,0.03123647400207119,None,2827,5691,3,0.030576758999814047,0.00012900500223622657
-5609333814,3177732288,0.037533951002842514,368.10345899843935,2827,5691,3,0.030525723999744514,0.00012815200170734897
-294919195,2639898838,0.03238734000478871,140.21450329712175,2827,5691,3,0.030055762003030395,0.00012867300029029138
-7042580417,435112933,0.036290686002757866,535.8777439426531,2827,5691,3,0.030611039001087192,0.0001282459998037666
-1672340374,6448461991,0.03323312599604833,286.2837684453694,2827,5691,3,0.02977259699764545,0.00014738100071554072
-508823963,1929118187,0.11812962000476546,21952.033894682114,2827,5691,3,0.029792550001729978,0.00012881400107289664
-1368670342,574449298,0.03879026299910038,289.11487947498966,2827,5691,3,0.03022124099879875,0.00012749099914799444
-1828400048,1362941672,0.034693206998781534,490.31985636850595,2827,5691,3,0.03039602799981367,0.0001429699987056665
-4016874408,288944220,0.037696138002502266,235.07185286856708,2827,5691,3,0.030579717000364326,0.00013163800031179562
-1672267709,473666786,0.07486753199918894,408.9790017628481,2827,5691,3,0.042540804999589454,0.00027316200066707097
-7286181353,4475742630,0.06981694099886226,335.2071411763051,2827,5691,3,0.05873935999989044,0.00014918300075805746
-549928583,1820309648,0.07036046000212082,287.5714344469538,2827,5691,3,0.05260475500108441,0.0002508870020392351
-2701813226,4955446072,0.058013172001665225,270.90837236452404,2827,5691,3,0.056110079000063706,0.0001506570006313268
-408478826,7286240207,0.187681405001058,9578.044926539376,2827,5691,3,0.05362652199983131,0.00024811700131976977
-473666774,292484328,0.06092164599976968,None,2827,5691,3,0.033805741997639416,0.00013096200200379826
-7165728799,7115183091,0.032751205002568895,88.19239151226196,2827,5691,3,0.03158794200135162,0.00013012700219405815
-2635713654,4955446028,0.0416352200008987,125.05689399557589,2827,5691,3,0.032492967999132816,0.00016993600002024323
-5113940036,1293287346,0.06488795000041137,399.1991755729142,2827,5691,3,0.057694219998666085,0.00015039600111776963
-1672267690,7286135545,0.04971095400105696,None,2827,5691,3,0.04919218600116437,0.0002804340001603123
-574457817,1672334393,0.11931271399953403,None,2827,5691,3,0.0517024289983965,0.00014572399959433824
-3111465608,410486365,0.04364582599737332,389.0809006977434,2827,5691,3,0.03290406599990092,0.00014593299783882685
+2598984220,317431286,0.042276075000700075,498.1140111598792,2827,5691,3,0.02612539600158925,0.00022654100030194968
+1574635376,2608394376,0.02502237200314994,None,2827,5691,3,0.024410483001702232,0.00014671100143459626
+292485282,2639932980,0.032847981001395965,288.6212594295983,2827,5691,3,0.02465888000006089,0.00013022400162299164
+7115183090,49109518,0.10543369100196287,None,2827,5691,3,0.024544266001612414,0.00013008800306124613
+563188714,2616315920,0.0282794679988001,441.49586624662686,2827,5691,3,0.023812198000086937,0.00013296199904289097
+2705157118,3299068955,0.029098611001245445,344.81142283925794,2827,5691,3,0.02400959800070268,0.00013027100067120045
+3462099369,1935264851,0.10879190799823846,None,2827,5691,3,0.023196269998152275,0.00012858799891546369
+1827520760,1927634075,0.024613869998574955,None,2827,5691,3,0.02391307899961248,0.0001408280004397966
+7286135582,318014975,0.031734542000776855,291.32161516417983,2827,5691,3,0.024036185001023114,0.00013172800026950426
+1949865714,1929118103,0.03250576600112254,247.41047878926767,2827,5691,3,0.02430951700080186,0.000129755000671139
+7321855875,7286135544,0.02856469600010314,203.13436437693898,2827,5691,3,0.024096420002024388,0.00013256499732960947
+7031746253,1362941693,0.035447548998490674,567.6960773066983,2827,5691,3,0.02371362399935606,0.00013068599946564063
+549928581,7042580423,0.12114347600072506,None,2827,5691,3,0.02482005000274512,0.00018649999765329994
+306636859,3123285393,0.02678363299855846,134.30855985472655,2827,5691,3,0.025068437000300037,0.00016796899944893084
+1828263505,7245276253,0.026912877001450397,172.3946058972845,2827,5691,3,0.023743199002637994,0.00013022999701206572
+3111465609,333265684,0.027224161000049207,158.3747300421578,2827,5691,3,0.023699797999142902,0.00013145599950803444
+574465020,7158827509,0.02451522599585587,50.69540952494169,2827,5691,3,0.023794642998836935,0.00013086599938105792
+4955446038,2701786783,0.043220919000305,474.42019948624187,2827,5691,3,0.027178383999853395,0.00020227200002409518
+1505057722,2598982820,0.025321151999378344,213.63162923041278,2827,5691,3,0.023105471998860594,0.00012981899999431334
+6417387121,45217575,0.039293615001952276,511.57995760781023,2827,5691,3,0.02367664200210129,0.00015038499986985698
+3307706690,2608500686,0.209684469999047,24742.559119734364,2827,5691,3,0.0443845939989842,0.00024026100072660483
+508823988,294921054,0.05452130499907071,445.6549504206056,2827,5691,3,0.03596596900024451,0.0002436579998175148
+1672267516,1253890971,0.05214218099717982,463.9904522865263,2827,5691,3,0.024084504999336787,0.00013771500016446225
+1827268706,306636851,0.063915946000634,307.2300820908875,2827,5691,3,0.047682315002020914,0.0002650359965628013
+408478755,1768859071,0.1860459159979655,54858.478484699735,2827,5691,3,0.045967697999003576,0.0002478620008332655
+1574635374,600855062,0.03292367100220872,322.93290424355115,2827,5691,3,0.025225121000403306,0.00014753000141354278
+2598983963,317766814,0.042491768992476864,296.63342740485876,2827,5691,3,0.029071484997984953,0.0002648979971127119
+321209227,646729161,0.06817621099980897,442.53836425358986,2827,5691,3,0.05043920100069954,0.0002550350000092294
+6807158096,3123285424,0.06127541499881772,202.045423495865,2827,5691,3,0.050061687998095294,0.0002503850009816233
+549943301,2598987933,0.04687722400194616,35.523732987539006,2827,5691,3,0.04580321899993578,0.00023641000007046387
+1505052514,333265696,0.051330194997717626,226.88367088862458,2827,5691,3,0.044925823000085074,0.0002522859977034386
+549931432,2604686222,0.052016783996805316,86.4933235550859,2827,5691,3,0.04930432299806853,0.00024924299941631034
+318015042,288947631,0.07891565099635045,421.1855259966528,2827,5691,3,0.050491611000325065,0.00023426199913956225
+7257113598,7031883144,0.07612812200022745,481.6685944984319,2827,5691,3,0.04874004299927037,0.0002568970012362115
+6448459782,4016874494,0.05312677099936991,131.90751888540956,2827,5691,3,0.04871241699947859,0.0002386679989285767
+473666790,418009807,0.21033150999937789,7237.621358907038,2827,5691,3,0.04875911800263566,0.0002493579995643813
+2709966866,7140363810,0.13560748100280762,10403.398566208132,2827,5691,3,0.036552887002471834,0.00014791600187891163
+4955446021,6053177179,0.035603660999186104,257.7677435214174,2827,5691,3,0.02866313699996681,0.00013347200001589954
+574505825,7286135580,0.03587911399881705,502.49813461242684,2827,5691,3,0.02321532900168677,0.000130749998788815
+3152652398,2632841195,0.025318888994661393,16.05410064430767,2827,5691,3,0.024955302997113904,0.00013186099749873392
+6389441585,549931439,0.0332952130047488,286.0696115473284,2827,5691,3,0.024250475002190797,0.00013609800225822255
+4955445788,2598984696,0.19080991900045774,14301.34473395243,2827,5691,3,0.023874270998931024,0.00013205600043875165
+2635713649,34911573,0.0971053480025148,None,2827,5691,3,0.04580549000093015,0.00024869800108717754
+2554184488,288944214,0.06897250700058066,452.6269758518667,2827,5691,3,0.04864492699925904,0.0002491650011506863
+418009813,574496336,0.06531908100077999,488.8373405449547,2827,5691,3,0.048711422001360916,0.00014795099923503585
+3462099513,365064191,0.0404399410035694,241.9305441128864,2827,5691,3,0.03644991400142317,0.00014536600065184757
+4321209903,288947635,0.029248424001707463,89.32726022221709,2827,5691,3,0.02698464400236844,0.0001498179990448989
+2621360530,1362941667,0.037620651004544925,404.88978534474785,2827,5691,3,0.02823518100194633,0.0001492770024924539
+2621386740,426948337,0.2415351660019951,18458.434029045413,2827,5691,3,0.03658536299917614,0.0001484990025346633
+360747463,1253890891,0.05129123999722651,115.8616723797326,2827,5691,3,0.048186755000642734,0.0002470779982104432
+90713483,1828418233,0.0532164849973924,67.6729183253639,2827,5691,3,0.04914040199946612,0.00024236500030383468
+318015042,4016874623,0.051894880994950654,146.82532607152257,2827,5691,3,0.046217121998779476,0.00015891599832684733
+5095519274,6001542005,0.0618195229981211,394.8821819040191,2827,5691,3,0.05200467400209163,0.00025152299713226967
+574475518,2621506083,0.060032460001821164,296.1749244866103,2827,5691,3,0.04660530799810658,0.00017216300329891965
+292728423,4845192812,0.06360029500137898,324.25303154204727,2827,5691,3,0.04478140200080816,0.0002652650000527501
+7245276253,469718545,0.04932073699819739,225.2174804198681,2827,5691,3,0.03702269099812838,0.00024437400134047493
+2600456373,474997349,0.036294464000093285,511.11398598162265,2827,5691,3,0.02658232199974009,0.00013334599861991592
+430534355,1830470690,0.03571396800180082,3.5819980124555086,2827,5691,3,0.03551292900010594,0.000145958001667168
+318261957,2616315925,0.06110411600093357,478.54912090204874,2827,5691,3,0.038274270002148114,0.0002577459999884013
+6908174001,600858234,0.17091138699834119,13045.53481380464,2827,5691,3,0.03817972499746247,0.00013393200060818344
+45217432,317839009,0.02850118600326823,214.85683549218038,2827,5691,3,0.02397998200103757,0.0001316720008617267
+4016874515,2598981737,0.05441371000051731,414.03216869826895,2827,5691,3,0.03305683099824819,0.00021097600256325677
+34053772,2709164536,0.12986579700009315,17269.037868168176,2827,5691,3,0.027068420000432525,0.00013286899775266647
+2614897350,410488856,0.037001697994128335,490.60053969987376,2827,5691,3,0.024741843997617252,0.00013104099707561545
+574482753,7028725556,0.1460951480003132,16427.532386083345,2827,5691,3,0.024953752999863354,0.00013120500079821795
+408478763,2612706786,0.03189900200231932,542.9635549695838,2827,5691,3,0.025356537000334356,0.00013355299961403944
+674511701,360747493,0.0341482889962208,540.9390299817543,2827,5691,3,0.025525667999318102,0.00013199299792177044
+549931430,2608394482,0.036105073002545396,291.48713827057804,2827,5691,3,0.026094094002473867,0.00017581300198799
+2613167250,405229458,0.027021646998036886,150.98464174372822,2827,5691,3,0.02527431099952082,0.00013304099775268696
+5576939248,2611370483,0.031118681003135862,247.59474539609872,2827,5691,3,0.025235213000996737,0.00013116600166540593
+2696567034,5609333812,0.04098827300185803,544.8291915663265,2827,5691,3,0.025695141001051525,0.00013136500274413265
+34053459,2605041420,0.13893630799793755,16686.743465059797,2827,5691,3,0.02505193399701966,0.0001327780009887647
+469872413,2612700811,0.04724072899989551,531.0346088911808,2827,5691,3,0.02813288900142652,0.0001322839998465497
+7202546042,426948337,0.028255796001758426,399.65304499593276,2827,5691,3,0.024184054000215838,0.00013037400276516564
+508824243,317839542,0.03214173200103687,250.2341684437973,2827,5691,3,0.023377393001283053,0.00013063199730822816
+1828269035,549920915,0.029996878998645116,229.8196777256521,2827,5691,3,0.024963100000604754,0.0001314289984293282
+2952146882,549938445,0.028604226998140803,138.30182936835243,2827,5691,3,0.025532285999361193,0.0001309809995291289
+317767230,7030602781,0.02625677299874951,45.661832779945314,2827,5691,3,0.024550326997996308,0.00022029799947631545
+7030602779,600861362,0.030182349000824615,194.54897286425881,2827,5691,3,0.02419876899875817,0.00016605400014668703
+574546116,665115012,0.04386719100511982,518.410521468413,2827,5691,3,0.02552339200337883,0.00013108900020597503
+1988057398,2637079129,0.11393830599990906,None,2827,5691,3,0.023645166998903733,0.00021378000019467436
+4955446046,7182110440,0.035406577997491695,380.9316035609116,2827,5691,3,0.02533617500012042,0.00013607999790110625
+3211622692,318260724,0.02851075200305786,265.28715514357395,2827,5691,3,0.02469539999947301,0.00013140800001565367
+574457822,3111465610,0.028822402004152536,187.30089552278895,2827,5691,3,0.023860298002546187,0.00013067799955024384
+474997016,3123285422,0.026905212002020562,238.8794603618747,2827,5691,3,0.023201427000458352,0.0001300430012634024
+4226442919,3522264443,0.026737287997093517,190.36745785565165,2827,5691,3,0.02355267399980221,0.00012953999976161867
+7140363801,333265692,0.12152014699677238,6198.220372891225,2827,5691,3,0.03502359399863053,0.0001346319986623712
+1828263512,17689717,0.04820222300259047,None,2827,5691,3,0.023400581001624232,0.00013006199878873304
+574449258,1929118240,0.04400225700010196,529.8540594348103,2827,5691,3,0.02335751799910213,0.00013055200179223903
+365070092,3211622686,0.029530750998674193,294.8068842064823,2827,5691,3,0.024598091000370914,0.00013135699919075705
+574465023,2616462233,0.027308120996167418,123.32236605762252,2827,5691,3,0.024595079998107394,0.00013265300003695302
+1362941674,7140339574,0.032680847001756774,187.11648556273997,2827,5691,3,0.025111782000749372,0.00013098800263833255
+646729161,3123285391,0.027806364003481576,108.17611080310326,2827,5691,3,0.024714111001230776,0.00013271500210976228
+1934201756,2554184498,0.13463329600199359,27634.257539908027,2827,5691,3,0.0243021590031276,0.00013173100160202011
+2623041440,4955446059,0.04510627600029693,583.5139470626206,2827,5691,3,0.024096565000945702,0.00013219399988884106
+288947629,6448462033,0.0365435920029995,410.99989791340255,2827,5691,3,0.02539478999824496,0.0001305210025748238
+1672340376,1362941687,0.024774151996098226,None,2827,5691,3,0.02441362499666866,0.00017993599976762198
+6943345426,7081828735,0.12339878300190321,10439.257141159233,2827,5691,3,0.024439984998025466,0.00013186200158088468
+317840788,318266812,0.03649396800392424,360.331834453331,2827,5691,3,0.02438458400138188,0.0001390470024489332
+473666764,360747431,0.027765100996475667,286.04783495751815,2827,5691,3,0.02464001399857807,0.00019689599866978824
diff --git a/evrouting/osm/imports.py b/evrouting/osm/imports.py
index dc631f1..a293532 100644
--- a/evrouting/osm/imports.py
+++ b/evrouting/osm/imports.py
@@ -189,6 +189,7 @@ class OSM(object):
"""
nodes = {}
ways = {}
+ node_histogram = defaultdict(lambda: 0)
class OSMHandler(xml.sax.ContentHandler):
def __init__(self):
@@ -216,7 +217,9 @@ class OSM(object):
elif name == 'tag':
self.currElem.tags[attrs['k']] = attrs['v']
elif name == 'nd':
- self.currElem.nds.append(attrs['ref'])
+ node_ref = attrs['ref']
+ node_histogram[node_ref] += 1
+ self.currElem.nds.append(node_ref)
@classmethod
def endElement(self, name):
@@ -232,13 +235,6 @@ class OSM(object):
xml.sax.parse(osm_xml_data, OSMHandler)
self.nodes = nodes
-
- # count times each node is used
- node_histogram = defaultdict(lambda: 0)
- for way in ways.values():
- for node in way.nds:
- node_histogram[node] += 1
-
# use that histogram to split all ways, replacing the member set of ways
self.ways = {
way.id: way for split_ways in [
--
GitLab