diff --git a/evaluation/results/bigger_gasstation/queries/astar.csv b/evaluation/results/bigger_gasstation/queries/astar.csv
index f23b557f3bb9227114b65ce333f440aaaf367f8b..9ee4853efe4ed4bff055a242d84bae20f80f3db4 100644
--- a/evaluation/results/bigger_gasstation/queries/astar.csv
+++ b/evaluation/results/bigger_gasstation/queries/astar.csv
@@ -1,11 +1,51 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
-139375,359729400,0.21402594599931035,6386.782035890964,513591,775628,1
-250043199,2094114064,0.3828877830001147,2061.5513214756365,513591,775628,1
-290243872,2924794161,1.036400960998435,4089.8880758620276,513591,775628,1
-35197895,242706074,0.37506153200047265,2473.4794774025822,513591,775628,1
-21297185,600945225,0.1753448199997365,4331.456744641118,513591,775628,1
-27264133,344360859,0.4022111859994766,44015.057562481015,513591,775628,1
-285988673,436459367,4.45825326099839,None,513591,775628,1
-2673428984,26159064,0.06246771599944623,5699.087054160015,513591,775628,1
-359182865,1122363069,0.998613526000554,37997.39341803828,513591,775628,1
-1574214691,4359641918,2.761475817000246,18570.646428422708,513591,775628,1
+356064976,2161161637,2.986799221000183,35739.375141037046,513591,775628,1
+1583071745,304688688,0.8890563829991152,8171.541368876941,513591,775628,1
+296875475,262983219,0.2959418909995293,14122.17088348552,513591,775628,1
+1842768188,2683109235,0.00022919099865248427,None,513591,775628,1
+4339983828,319689973,0.496508944001107,15041.777848001382,513591,775628,1
+756655150,2026656711,1.496062238000377,24267.46878972734,513591,775628,1
+1652568311,1442005480,0.4172755519994098,1999.2894472747967,513591,775628,1
+93962649,5042793533,2.6206917189992964,20725.35982456325,513591,775628,1
+1378735446,9211269,0.3188639679992775,18026.16041524591,513591,775628,1
+11297180,147885366,0.8250871760010341,12870.224079728721,513591,775628,1
+356064976,2161161637,2.973721131000275,35739.375141037046,513591,775628,2
+1583071745,304688688,0.8935957579997194,8171.541368876941,513591,775628,2
+296875475,262983219,0.28978155000004335,14122.17088348552,513591,775628,2
+1842768188,2683109235,0.00024132300131896045,None,513591,775628,2
+4339983828,319689973,0.4942466830016201,15041.777848001382,513591,775628,2
+756655150,2026656711,1.4877862659996026,24267.46878972734,513591,775628,2
+1652568311,1442005480,0.411498613000731,1999.2894472747967,513591,775628,2
+93962649,5042793533,2.597462806999829,20725.35982456325,513591,775628,2
+1378735446,9211269,0.3149557830001868,18026.16041524591,513591,775628,2
+11297180,147885366,0.8261179170003743,12870.224079728721,513591,775628,2
+356064976,2161161637,2.9933320069994807,35739.375141037046,513591,775628,4
+1583071745,304688688,0.9006716080002661,8171.541368876941,513591,775628,4
+296875475,262983219,0.29512271900057385,14122.17088348552,513591,775628,4
+1842768188,2683109235,0.00022774199896957725,None,513591,775628,4
+4339983828,319689973,0.4991671799998585,15041.777848001382,513591,775628,4
+756655150,2026656711,1.5058052309996128,24267.46878972734,513591,775628,4
+1652568311,1442005480,0.42189291899921955,1999.2894472747967,513591,775628,4
+93962649,5042793533,2.6109748470007617,20725.35982456325,513591,775628,4
+1378735446,9211269,0.3198035469995375,18026.16041524591,513591,775628,4
+11297180,147885366,0.8261629440003162,12870.224079728721,513591,775628,4
+356064976,2161161637,2.974910139999338,35739.375141037046,513591,775628,8
+1583071745,304688688,0.8857793160004803,8171.541368876941,513591,775628,8
+296875475,262983219,0.28911316100129625,14122.17088348552,513591,775628,8
+1842768188,2683109235,0.0002297730006830534,None,513591,775628,8
+4339983828,319689973,0.4920325209986913,15041.777848001382,513591,775628,8
+756655150,2026656711,1.4903997000001254,24267.46878972734,513591,775628,8
+1652568311,1442005480,0.4117345150007168,1999.2894472747967,513591,775628,8
+93962649,5042793533,2.587205695999728,20725.35982456325,513591,775628,8
+1378735446,9211269,0.31760394499906397,18026.16041524591,513591,775628,8
+11297180,147885366,0.8260610649995215,12870.224079728721,513591,775628,8
+356064976,2161161637,3.0102875510001468,35739.375141037046,513591,775628,9
+1583071745,304688688,0.8977671110005758,8171.541368876941,513591,775628,9
+296875475,262983219,0.29441664300065895,14122.17088348552,513591,775628,9
+1842768188,2683109235,0.0002216180000687018,None,513591,775628,9
+4339983828,319689973,0.4939608050008246,15041.777848001382,513591,775628,9
+756655150,2026656711,1.502814784000293,24267.46878972734,513591,775628,9
+1652568311,1442005480,0.4181236809999973,1999.2894472747967,513591,775628,9
+93962649,5042793533,2.6354020759990817,20725.35982456325,513591,775628,9
+1378735446,9211269,0.3202979800007597,18026.16041524591,513591,775628,9
+11297180,147885366,0.8307440849985142,12870.224079728721,513591,775628,9
diff --git a/evaluation/results/bigger_gasstation/queries/bidirectional.csv b/evaluation/results/bigger_gasstation/queries/bidirectional.csv
index 00ca40fd30b7868e073852b544f69bc4f75fdba0..d6971cea83b23b51e31191a86be60109939975c3 100644
--- a/evaluation/results/bigger_gasstation/queries/bidirectional.csv
+++ b/evaluation/results/bigger_gasstation/queries/bidirectional.csv
@@ -1,11 +1,51 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
-139375,359729400,0.797171084999718,6386.782035890954,513591,775628,1
-250043199,2094114064,0.3411777660003281,2061.551321475638,513591,775628,1
-290243872,2924794161,1.3071322430005239,4089.8880758620326,513591,775628,1
-35197895,242706074,1.1795155230011005,2473.4794774025822,513591,775628,1
-21297185,600945225,1.94670748200042,4331.456744641114,513591,775628,1
-27264133,344360859,32.13791204299923,44015.057562480986,513591,775628,1
-285988673,436459367,0.007224570999824209,None,513591,775628,1
-2673428984,26159064,0.09849873699931777,5699.087054160025,513591,775628,1
-359182865,1122363069,8.84167787000115,37997.39341803827,513591,775628,1
-1574214691,4359641918,6.900378794000062,18570.64642842273,513591,775628,1
+356064976,2161161637,19.94431713799895,35739.375141037235,513591,775628,1
+1583071745,304688688,2.3234408700009226,8171.541368876926,513591,775628,1
+296875475,262983219,1.6923411850002594,14122.170883485549,513591,775628,1
+1842768188,2683109235,0.00021880499843973666,None,513591,775628,1
+4339983828,319689973,2.8656074560003617,15041.777848001382,513591,775628,1
+756655150,2026656711,25.20438289000049,24267.46878972727,513591,775628,1
+1652568311,1442005480,0.6571212590006326,1999.2894472747967,513591,775628,1
+93962649,5042793533,3.6758251580013166,20725.359824563177,513591,775628,1
+1378735446,9211269,2.434538044999499,18026.16041524591,513591,775628,1
+11297180,147885366,1.835657628998888,12870.224079728696,513591,775628,1
+356064976,2161161637,14.973469570999441,35739.375141037235,513591,775628,2
+1583071745,304688688,2.2730369590008195,8171.541368876926,513591,775628,2
+296875475,262983219,1.6442968850005855,14122.170883485549,513591,775628,2
+1842768188,2683109235,0.00021324699991964735,None,513591,775628,2
+4339983828,319689973,2.8170918770010758,15041.777848001382,513591,775628,2
+756655150,2026656711,19.632519064000007,24267.46878972727,513591,775628,2
+1652568311,1442005480,0.6363059179984702,1999.2894472747967,513591,775628,2
+93962649,5042793533,3.6591376939995826,20725.359824563177,513591,775628,2
+1378735446,9211269,2.413896133999515,18026.16041524591,513591,775628,2
+11297180,147885366,1.8224046369996358,12870.224079728696,513591,775628,2
+356064976,2161161637,15.180819830999098,35739.375141037235,513591,775628,4
+1583071745,304688688,2.3740933919998497,8171.541368876926,513591,775628,4
+296875475,262983219,1.7577968840014364,14122.170883485549,513591,775628,4
+1842768188,2683109235,0.00021562199981417507,None,513591,775628,4
+4339983828,319689973,2.959380885000428,15041.777848001382,513591,775628,4
+756655150,2026656711,25.808272795999073,24267.46878972727,513591,775628,4
+1652568311,1442005480,0.6644060540002101,1999.2894472747967,513591,775628,4
+93962649,5042793533,3.717582619001405,20725.359824563177,513591,775628,4
+1378735446,9211269,2.4863603550002153,18026.16041524591,513591,775628,4
+11297180,147885366,1.862287007001214,12870.224079728696,513591,775628,4
+356064976,2161161637,15.777177714000572,35739.375141037235,513591,775628,8
+1583071745,304688688,2.367666787999042,8171.541368876926,513591,775628,8
+296875475,262983219,1.6492550629991456,14122.170883485549,513591,775628,8
+1842768188,2683109235,0.0002113780010404298,None,513591,775628,8
+4339983828,319689973,2.8201387070002966,15041.777848001382,513591,775628,8
+756655150,2026656711,19.874378702001195,24267.46878972727,513591,775628,8
+1652568311,1442005480,0.6439645819991711,1999.2894472747967,513591,775628,8
+93962649,5042793533,3.5952995530005865,20725.359824563177,513591,775628,8
+1378735446,9211269,2.3434023829995567,18026.16041524591,513591,775628,8
+11297180,147885366,1.7840517109998473,12870.224079728696,513591,775628,8
+356064976,2161161637,15.01481696799965,35739.375141037235,513591,775628,9
+1583071745,304688688,2.36539244999949,8171.541368876926,513591,775628,9
+296875475,262983219,1.6356221260011807,14122.170883485549,513591,775628,9
+1842768188,2683109235,0.0002111569992848672,None,513591,775628,9
+4339983828,319689973,2.8068264619996626,15041.777848001382,513591,775628,9
+756655150,2026656711,19.807072899999184,24267.46878972727,513591,775628,9
+1652568311,1442005480,0.9141613160009001,1999.2894472747967,513591,775628,9
+93962649,5042793533,3.573003270999834,20725.359824563177,513591,775628,9
+1378735446,9211269,2.3204707599998073,18026.16041524591,513591,775628,9
+11297180,147885366,1.768642742999873,12870.224079728696,513591,775628,9
diff --git a/evaluation/results/bigger_gasstation/queries/charge.csv b/evaluation/results/bigger_gasstation/queries/charge.csv
index cb7c596ab40a63f86052330469012082389ce501..e85765f9d3ef9d42acaf1ff16c5b10106263c4ef 100644
--- a/evaluation/results/bigger_gasstation/queries/charge.csv
+++ b/evaluation/results/bigger_gasstation/queries/charge.csv
@@ -1,7 +1,51 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,charging_stops,charging_time
-139375,359729400,3.6201027700008126,None,513592,775628,1,0,0
-250043199,2094114064,35.17749985000046,2061.5513214756365,513591,775628,1,0,0
-290243872,2924794161,81.72742420400027,None,513592,775628,1,0,0
-35197895,242706074,46.879257751001205,2473.4794774025822,513591,775628,1,0,0
-21297185,600945225,18.159396734999973,None,513592,775628,1,0,0
-27264133,344360859,2.8233241140005703,None,513591,775628,1,0,0
+356064976,2161161637,2.959312218999912,None,513592,775628,1,0,0
+1583071745,304688688,3.571929250998437,None,513591,775628,1,0,0
+296875475,262983219,3.184891285000049,None,513592,775628,1,0,0
+1842768188,2683109235,2.5210230630000297,None,513591,775628,1,0,0
+4339983828,319689973,2.7667488750012126,None,513592,775628,1,0,0
+756655150,2026656711,61.88889886400102,None,513591,775628,1,0,0
+1652568311,1442005480,24.857388452999658,1999.2894472747967,513592,775628,1,0,0
+93962649,5042793533,78.40748663799968,None,513591,775628,1,0,0
+1378735446,9211269,3.8967899039998883,None,513592,775628,1,0,0
+11297180,147885366,3.0133103039988782,None,513591,775628,1,0,0
+356064976,2161161637,3.3024542439998186,None,513592,775628,2,0,0
+1583071745,304688688,3.0118312619997596,None,513591,775628,2,0,0
+296875475,262983219,3.453349146999244,None,513592,775628,2,0,0
+1842768188,2683109235,2.5392268739997235,None,513591,775628,2,0,0
+4339983828,319689973,2.831730776000768,None,513592,775628,2,0,0
+756655150,2026656711,61.87120010400031,None,513591,775628,2,0,0
+1652568311,1442005480,25.00004773100045,1999.2894472747967,513592,775628,2,0,0
+93962649,5042793533,78.31989984599932,None,513591,775628,2,0,0
+1378735446,9211269,4.149330255000677,None,513592,775628,2,0,0
+11297180,147885366,2.9874655319999874,None,513591,775628,2,0,0
+356064976,2161161637,3.4268298280003364,None,513592,775628,4,0,0
+1583071745,304688688,2.7123987470004067,None,513591,775628,4,0,0
+296875475,262983219,3.7481481609993352,None,513592,775628,4,0,0
+1842768188,2683109235,2.5740128249999543,None,513591,775628,4,0,0
+4339983828,319689973,2.861746728000071,None,513592,775628,4,0,0
+756655150,2026656711,63.074334162000014,None,513591,775628,4,0,0
+1652568311,1442005480,24.711284021999745,1999.2894472747967,513592,775628,4,0,0
+93962649,5042793533,79.82626471200092,None,513591,775628,4,0,0
+1378735446,9211269,4.40798881199953,None,513592,775628,4,0,0
+11297180,147885366,2.6641963420006505,None,513591,775628,4,0,0
+356064976,2161161637,2.9899973470000987,None,513592,775628,8,0,0
+1583071745,304688688,5.302648766000857,None,513591,775628,8,0,0
+296875475,262983219,3.6561590890014486,None,513592,775628,8,0,0
+1842768188,2683109235,2.4616497110000637,None,513591,775628,8,0,0
+4339983828,319689973,3.010175903000345,None,513592,775628,8,0,0
+756655150,2026656711,62.09442291999949,None,513591,775628,8,0,0
+1652568311,1442005480,25.35343048499999,1999.2894472747967,513592,775628,8,0,0
+93962649,5042793533,218.35150024599898,None,513591,775628,8,0,0
+1378735446,9211269,3.5123171909999655,None,513592,775628,8,0,0
+11297180,147885366,2.9044576979995327,None,513591,775628,8,0,0
+356064976,2161161637,3.3317493150007067,None,513592,775628,9,0,0
+1583071745,304688688,9.05409529499957,None,513591,775628,9,0,0
+296875475,262983219,4.59987395799908,None,513592,775628,9,0,0
+1842768188,2683109235,3.0174734180000087,None,513591,775628,9,0,0
+4339983828,319689973,2.845918827000787,None,513592,775628,9,0,0
+756655150,2026656711,197.83291155900042,None,513591,775628,9,0,0
+1652568311,1442005480,24.89595771400127,1999.2894472747967,513592,775628,9,0,0
+93962649,5042793533,77.53829125999982,None,513591,775628,9,0,0
+1378735446,9211269,3.813027955000507,None,513592,775628,9,0,0
+11297180,147885366,2.9256836010008556,None,513591,775628,9,0,0
diff --git a/evaluation/results/bigger_gasstation/queries/classic.csv b/evaluation/results/bigger_gasstation/queries/classic.csv
index f2a0a93275b973c61e974eb5e609d8d80aa2afde..020d5d99d84d405c2f58ff4edb527fccd43af75c 100644
--- a/evaluation/results/bigger_gasstation/queries/classic.csv
+++ b/evaluation/results/bigger_gasstation/queries/classic.csv
@@ -1,11 +1,51 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,dijkstra_rank
-139375,359729400,0.2691591379989404,6386.782035890964,513591,775628,1,93242
-250043199,2094114064,0.21526203099892882,2061.5513214756365,513591,775628,1,75339
-290243872,2924794161,0.6320057989996712,4089.8880758620276,513591,775628,1,205739
-35197895,242706074,0.30114290900019114,2473.4794774025822,513591,775628,1,103166
-21297185,600945225,0.44714753100015514,4331.456744641118,513591,775628,1,148214
-27264133,344360859,0.21585859900005744,44015.057562481015,513591,775628,1,99549
-285988673,436459367,1.2430457810005464,None,513591,775628,1,None
-2673428984,26159064,0.5976482030000625,5699.087054160015,513591,775628,1,191719
-359182865,1122363069,0.7578925420002633,37997.39341803828,513591,775628,1,263332
-1574214691,4359641918,1.0275679269998363,18570.646428422708,513591,775628,1,373169
+356064976,2161161637,1.1266932460002863,35739.375141037046,513591,775628,1,416913
+1583071745,304688688,0.6591713050001999,8171.541368876941,513591,775628,1,214546
+296875475,262983219,0.853834718998769,14122.17088348552,513591,775628,1,303351
+1842768188,2683109235,0.00011337300020386465,None,513591,775628,1,None
+4339983828,319689973,0.389110020998487,15041.777848001382,513591,775628,1,134749
+756655150,2026656711,1.1144071140006417,24267.46878972734,513591,775628,1,411474
+1652568311,1442005480,0.24704258600104367,1999.2894472747967,513591,775628,1,81223
+93962649,5042793533,1.0940794840007584,20725.35982456325,513591,775628,1,396599
+1378735446,9211269,0.8055836139992607,18026.16041524591,513591,775628,1,274012
+11297180,147885366,0.45066150299862784,12870.224079728721,513591,775628,1,153690
+356064976,2161161637,1.0938188359996275,35739.375141037046,513591,775628,2,416913
+1583071745,304688688,0.6445669259992428,8171.541368876941,513591,775628,2,214546
+296875475,262983219,0.8494737179989897,14122.17088348552,513591,775628,2,303351
+1842768188,2683109235,8.610199984104838e-05,None,513591,775628,2,None
+4339983828,319689973,0.3847448529995745,15041.777848001382,513591,775628,2,134749
+756655150,2026656711,1.0869639579996146,24267.46878972734,513591,775628,2,411474
+1652568311,1442005480,0.24158633099978033,1999.2894472747967,513591,775628,2,81223
+93962649,5042793533,1.0609143780002341,20725.35982456325,513591,775628,2,396599
+1378735446,9211269,0.7921932080007537,18026.16041524591,513591,775628,2,274012
+11297180,147885366,0.4445602019986836,12870.224079728721,513591,775628,2,153690
+356064976,2161161637,1.1612765150002815,35739.375141037046,513591,775628,4,416913
+1583071745,304688688,0.6876919339993037,8171.541368876941,513591,775628,4,214546
+296875475,262983219,0.9005591129989625,14122.17088348552,513591,775628,4,303351
+1842768188,2683109235,8.82379990798654e-05,None,513591,775628,4,None
+4339983828,319689973,0.41097905700007686,15041.777848001382,513591,775628,4,134749
+756655150,2026656711,1.1568849759987643,24267.46878972734,513591,775628,4,411474
+1652568311,1442005480,0.25607972199941287,1999.2894472747967,513591,775628,4,81223
+93962649,5042793533,1.1281588749989169,20725.35982456325,513591,775628,4,396599
+1378735446,9211269,0.8427496820004308,18026.16041524591,513591,775628,4,274012
+11297180,147885366,0.47598157600077684,12870.224079728721,513591,775628,4,153690
+356064976,2161161637,1.098419649999414,35739.375141037046,513591,775628,8,416913
+1583071745,304688688,0.6444937889991706,8171.541368876941,513591,775628,8,214546
+296875475,262983219,0.8498032560000865,14122.17088348552,513591,775628,8,303351
+1842768188,2683109235,8.055600119405426e-05,None,513591,775628,8,None
+4339983828,319689973,0.38359729500007234,15041.777848001382,513591,775628,8,134749
+756655150,2026656711,1.085738403000505,24267.46878972734,513591,775628,8,411474
+1652568311,1442005480,0.23959333400125615,1999.2894472747967,513591,775628,8,81223
+93962649,5042793533,1.0602484949995414,20725.35982456325,513591,775628,8,396599
+1378735446,9211269,0.7942833549986972,18026.16041524591,513591,775628,8,274012
+11297180,147885366,0.44799292199968477,12870.224079728721,513591,775628,8,153690
+356064976,2161161637,1.1123621120004827,35739.375141037046,513591,775628,9,416913
+1583071745,304688688,0.6548990549999871,8171.541368876941,513591,775628,9,214546
+296875475,262983219,0.8634716319993458,14122.17088348552,513591,775628,9,303351
+1842768188,2683109235,8.305400115204975e-05,None,513591,775628,9,None
+4339983828,319689973,0.3935752739998861,15041.777848001382,513591,775628,9,134749
+756655150,2026656711,1.1071964360016864,24267.46878972734,513591,775628,9,411474
+1652568311,1442005480,0.24663246799900662,1999.2894472747967,513591,775628,9,81223
+93962649,5042793533,1.0784121220003726,20725.35982456325,513591,775628,9,396599
+1378735446,9211269,0.8058814899995923,18026.16041524591,513591,775628,9,274012
+11297180,147885366,0.4547161110003799,12870.224079728721,513591,775628,9,153690
diff --git a/evaluation/results/bigger_gasstation/queries/gasstation.csv b/evaluation/results/bigger_gasstation/queries/gasstation.csv
index e886269df5da82552526279e497779dc7c27795f..25f7131b85a1b6beeee26016be6de531852b5238 100644
--- a/evaluation/results/bigger_gasstation/queries/gasstation.csv
+++ b/evaluation/results/bigger_gasstation/queries/gasstation.csv
@@ -1,11 +1,51 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,charging_stops,charging_time,time_contracted_graph,time_state_graph,nodes_state_graph,edges_state_graph
-139375,359729400,1.770325994999439,None,513591,775628,1,0,0,0.0001419079999323003,2.669600144145079e-05,0,0
-250043199,2094114064,0.3868539589984721,2061.5513214756365,513591,775628,1,0,0,0.0001419079999323003,2.669600144145079e-05,0,0
-290243872,2924794161,5.387110006000512,None,513591,775628,1,0,0,0.0001419079999323003,2.669600144145079e-05,0,0
-35197895,242706074,0.38850234699930297,2473.4794774025822,513591,775628,1,0,0,0.0001419079999323003,2.669600144145079e-05,0,0
-21297185,600945225,2.1060162520006998,None,513591,775628,1,0,0,0.0001419079999323003,2.669600144145079e-05,0,0
-27264133,344360859,4.44676967399937,None,513591,775628,1,0,0,0.0001419079999323003,2.669600144145079e-05,0,0
-285988673,436459367,4.46447135499875,None,513591,775628,1,0,0,0.0001419079999323003,2.669600144145079e-05,0,0
-2673428984,26159064,0.6163459680010419,None,513591,775628,1,0,0,0.0001419079999323003,2.669600144145079e-05,0,0
-359182865,1122363069,1.7503331149982841,None,513591,775628,1,0,0,0.0001419079999323003,2.669600144145079e-05,0,0
-1574214691,4359641918,5.023242899000252,None,513591,775628,1,0,0,0.0001419079999323003,2.669600144145079e-05,0,0
+356064976,2161161637,3.6292336850001448,None,513591,775628,1,0,0,0.000128629000755609,2.447099905111827e-05,0,0
+1583071745,304688688,1.3680140409996966,None,513591,775628,1,0,0,0.000128629000755609,2.447099905111827e-05,0,0
+296875475,262983219,0.7980567630002042,None,513591,775628,1,0,0,0.000128629000755609,2.447099905111827e-05,0,0
+1842768188,2683109235,0.00024097800087474752,None,513591,775628,1,0,0,0.000128629000755609,2.447099905111827e-05,0,0
+4339983828,319689973,0.9179881290001504,None,513591,775628,1,0,0,0.000128629000755609,2.447099905111827e-05,0,0
+756655150,2026656711,1.9193353299997398,None,513591,775628,1,0,0,0.000128629000755609,2.447099905111827e-05,0,0
+1652568311,1442005480,0.4210803779988055,1999.2894472747967,513591,775628,1,0,0,0.000128629000755609,2.447099905111827e-05,0,0
+93962649,5042793533,2.826067564999903,None,513591,775628,1,0,0,0.000128629000755609,2.447099905111827e-05,0,0
+1378735446,9211269,0.9020027850001497,None,513591,775628,1,0,0,0.000128629000755609,2.447099905111827e-05,0,0
+11297180,147885366,1.1748564040008205,None,513591,775628,1,0,0,0.000128629000755609,2.447099905111827e-05,0,0
+356064976,2161161637,10.568507746998876,None,513591,775628,2,0,0,0.05666018599913514,2.500099981261883e-05,0,0
+1583071745,304688688,7.715704510999785,None,513591,775628,2,0,0,0.05666018599913514,2.500099981261883e-05,0,0
+296875475,262983219,6.020314425000834,None,513591,775628,2,0,0,0.05666018599913514,2.500099981261883e-05,0,0
+1842768188,2683109235,0.0002078320012515178,None,513591,775628,2,0,0,0.05666018599913514,2.500099981261883e-05,0,0
+4339983828,319689973,6.761734260000594,None,513591,775628,2,0,0,0.05666018599913514,2.500099981261883e-05,0,0
+756655150,2026656711,8.257747196999844,None,513591,775628,2,0,0,0.05666018599913514,2.500099981261883e-05,0,0
+1652568311,1442005480,0.41691295500095293,1999.2894472747967,513591,775628,2,0,0,0.05666018599913514,2.500099981261883e-05,0,0
+93962649,5042793533,8.589414210000541,None,513591,775628,2,0,0,0.05666018599913514,2.500099981261883e-05,0,0
+1378735446,9211269,6.219843938999475,None,513591,775628,2,0,0,0.05666018599913514,2.500099981261883e-05,0,0
+11297180,147885366,7.057569034001062,None,513591,775628,2,0,0,0.05666018599913514,2.500099981261883e-05,0,0
+356064976,2161161637,7.715225370999178,None,513591,775628,4,0,0,4.993426892000571,5.600700023933314e-05,0,0
+1583071745,304688688,7.689656051999918,None,513591,775628,4,0,0,4.993426892000571,5.600700023933314e-05,0,0
+296875475,262983219,6.509500861000561,None,513591,775628,4,0,0,4.993426892000571,5.600700023933314e-05,0,0
+1842768188,2683109235,0.00024089699945761822,None,513591,775628,4,0,0,4.993426892000571,5.600700023933314e-05,0,0
+4339983828,319689973,6.178335046999564,None,513591,775628,4,0,0,4.993426892000571,5.600700023933314e-05,0,0
+756655150,2026656711,6.742742226999326,None,513591,775628,4,0,0,4.993426892000571,5.600700023933314e-05,0,0
+1652568311,1442005480,0.4128949910009396,1999.2894472747967,513591,775628,4,0,0,4.993426892000571,5.600700023933314e-05,0,0
+93962649,5042793533,7.6941876629989565,None,513591,775628,4,0,0,4.993426892000571,5.600700023933314e-05,0,0
+1378735446,9211269,7.157893085000978,None,513591,775628,4,0,0,4.993426892000571,5.600700023933314e-05,0,0
+11297180,147885366,6.439062055998875,None,513591,775628,4,0,0,4.993426892000571,5.600700023933314e-05,0,0
+356064976,2161161637,19.956206586000917,None,513591,775628,8,0,0,23.93736563299899,0.0001504320007370552,6,5
+1583071745,304688688,16.367296889999125,None,513591,775628,8,0,0,23.93736563299899,0.0001504320007370552,6,5
+296875475,262983219,10.299942493000344,None,513591,775628,8,0,0,23.93736563299899,0.0001504320007370552,6,5
+1842768188,2683109235,0.00021826100055477582,None,513591,775628,8,0,0,23.93736563299899,0.0001504320007370552,6,5
+4339983828,319689973,16.446219965999262,None,513591,775628,8,0,0,23.93736563299899,0.0001504320007370552,6,5
+756655150,2026656711,18.91509878800025,None,513591,775628,8,0,0,23.93736563299899,0.0001504320007370552,6,5
+1652568311,1442005480,0.42105094399994414,1999.2894472747967,513591,775628,8,0,0,23.93736563299899,0.0001504320007370552,6,5
+93962649,5042793533,17.021018577999712,None,513591,775628,8,0,0,23.93736563299899,0.0001504320007370552,6,5
+1378735446,9211269,10.203858035998564,None,513591,775628,8,0,0,23.93736563299899,0.0001504320007370552,6,5
+11297180,147885366,17.152377894000892,None,513591,775628,8,0,0,23.93736563299899,0.0001504320007370552,6,5
+356064976,2161161637,32.18037529000139,None,513591,775628,9,0,0,24.844140257000618,0.00010361400018155109,2,2
+1583071745,304688688,27.342116884999996,None,513591,775628,9,0,0,24.844140257000618,0.00010361400018155109,2,2
+296875475,262983219,21.665445778000503,None,513591,775628,9,0,0,24.844140257000618,0.00010361400018155109,2,2
+1842768188,2683109235,0.00021819299945491366,None,513591,775628,9,0,0,24.844140257000618,0.00010361400018155109,2,2
+4339983828,319689973,32.5883200699991,None,513591,775628,9,0,0,24.844140257000618,0.00010361400018155109,2,2
+756655150,2026656711,34.37771459299984,None,513591,775628,9,0,0,24.844140257000618,0.00010361400018155109,2,2
+1652568311,1442005480,0.41182118999859085,1999.2894472747967,513591,775628,9,0,0,24.844140257000618,0.00010361400018155109,2,2
+93962649,5042793533,34.249777852999614,None,513591,775628,9,0,0,24.844140257000618,0.00010361400018155109,2,2
+1378735446,9211269,20.049395914000343,None,513591,775628,9,0,0,24.844140257000618,0.00010361400018155109,2,2
+11297180,147885366,36.45061352300036,None,513591,775628,9,0,0,24.844140257000618,0.00010361400018155109,2,2
diff --git a/evaluation/run.py b/evaluation/run.py
index aa184e8c2ab34d6eac74541f98eaaa26c0e9f128..38daee792649ded6816004dc46fdff583e623107 100644
--- a/evaluation/run.py
+++ b/evaluation/run.py
@@ -33,8 +33,8 @@ def query_benchmark(graphs, conf, result_dir):
'astar': Query(astar_query, 'astar.csv', AStarQueryRow),
'bidirectional': Query(bidirectional_query, 'bidirectional.csv', QueryRow),
'gasstation': Query(query_function=gasstation_query,
- filename='gasstation.csv',
- row_dataclass=GasstationQueryRow),
+ filename='gasstation.csv',
+ row_dataclass=GasstationQueryRow),
'charge': Query(charge_query, 'charge.csv', ChargeQueryRow)
}
@@ -63,7 +63,8 @@ def query_benchmark(graphs, conf, result_dir):
func.__name__,
map_name
))
- for s, t in zip(start_nodes, target_nodes):
+ for i, (s, t) in enumerate(zip(start_nodes, target_nodes)):
+ logging.info(f'{i + 1}/{len(start_nodes)}')
with result_dir.joinpath(filename).open('a') as f:
write_row(f, func(G, setup, s, t))