Skip to content
Snippets Groups Projects
Commit d9ab9974 authored by markn92's avatar markn92
Browse files

bug

parent b923bd64
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
evaluation/lib/queries.py
+ 5
− 6
View file @ d9ab9974
......@@ -30,16 +30,15 @@ CACHE = {}
def cached(key):
"""Cache returned graph to file in temp_dir."""
"""Cache return value."""
def decorator(func):
def getter(*args, **kwargs):
try:
return CACHE[key], None
return CACHE[key]
except KeyError:
graph, runtime = func(*args, **kwargs)
CACHE[key] = graph
return graph, runtime
ret = func(*args, **kwargs)
CACHE[key] = ret
return ret
return getter
......
evaluation/results/example/queries/astar.csv
+ 30
− 32
View file @ d9ab9974
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
418009800,574457854,0.016365269000743865,513.3867017835531,2827,5691,1
1934189643,1672267862,0.024794959999780986,None,2827,5691,1
4955445788,2608597329,0.006531982999149477,468.61012521592113,2827,5691,1
3111465599,426948327,0.02325725999980932,733.6313989681807,2827,5691,1
426930250,360747525,0.010435072001200751,730.4096032452347,2827,5691,1
2626105675,574449298,0.015268628001649631,581.5878060414734,2827,5691,1
2608501851,418009810,0.009202822999213822,311.5216253485141,2827,5691,1
1718397716,294919195,0.00783049699930416,316.4427340861574,2827,5691,1
405229458,748845494,0.007164475000536186,241.74032174316505,2827,5691,1
5726327175,5576939249,0.005316733000654494,133.7762557564627,2827,5691,1
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
418009800,574457854,0.01609230000030948,513.3867017835531,2827,5691,2
1934189643,1672267862,0.02513524099958886,None,2827,5691,2
4955445788,2608597329,0.006504785998913576,468.61012521592113,2827,5691,2
3111465599,426948327,0.02274821399987559,733.6313989681807,2827,5691,2
426930250,360747525,0.010359958001572522,730.4096032452347,2827,5691,2
2626105675,574449298,0.015497483000217471,581.5878060414734,2827,5691,2
2608501851,418009810,0.009121514000071329,311.5216253485141,2827,5691,2
1718397716,294919195,0.007242572999530239,316.4427340861574,2827,5691,2
405229458,748845494,0.0071749509988876525,241.74032174316505,2827,5691,2
5726327175,5576939249,0.00539905000005092,133.7762557564627,2827,5691,2
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
418009800,574457854,0.01592524300031073,513.3867017835531,2827,5691,3
1934189643,1672267862,0.0248023820004164,None,2827,5691,3
4955445788,2608597329,0.006321331999060931,468.61012521592113,2827,5691,3
3111465599,426948327,0.023352963999059284,733.6313989681807,2827,5691,3
426930250,360747525,0.010226640999462688,730.4096032452347,2827,5691,3
2626105675,574449298,0.015081085999554489,581.5878060414734,2827,5691,3
2608501851,418009810,0.00919760700162442,311.5216253485141,2827,5691,3
1718397716,294919195,0.007316459999856306,316.4427340861574,2827,5691,3
405229458,748845494,0.0069069710007170215,241.74032174316505,2827,5691,3
5726327175,5576939249,0.005275892001009197,133.7762557564627,2827,5691,3
418009821,6908239938,0.0013994670007377863,182.74421871348966,2827,5691,1
294919191,549931427,0.001375193998683244,92.76809036038416,2827,5691,1
473666784,1574635372,0.005434329999843612,468.3819988021434,2827,5691,1
321209227,6908124636,0.0029110110008332413,229.51616972555465,2827,5691,1
317841012,292485286,0.01097075899997435,288.05111883053104,2827,5691,1
2639898838,2611606215,0.007764956000755774,372.67570264869573,2827,5691,1
360747762,1830470692,0.022057453999877907,1009.4538720402156,2827,5691,1
2608678897,5023014974,0.01400541699877067,440.0800197153627,2827,5691,1
360747836,474997352,0.00462288900052954,476.7818535757649,2827,5691,1
317838183,360747691,0.026331659000788932,888.0361882245362,2827,5691,1
418009821,6908239938,0.0013213029997132253,182.74421871348966,2827,5691,2
294919191,549931427,0.0013983109984110342,92.76809036038416,2827,5691,2
473666784,1574635372,0.005630277000818751,468.3819988021434,2827,5691,2
321209227,6908124636,0.002878322999094962,229.51616972555465,2827,5691,2
317841012,292485286,0.01084264000019175,288.05111883053104,2827,5691,2
2639898838,2611606215,0.007949319999170257,372.67570264869573,2827,5691,2
360747762,1830470692,0.0222765390008135,1009.4538720402156,2827,5691,2
2608678897,5023014974,0.01365691200044239,440.0800197153627,2827,5691,2
360747836,474997352,0.004824731000553584,476.7818535757649,2827,5691,2
317838183,360747691,0.025847368000540882,888.0361882245362,2827,5691,2
418009821,6908239938,0.001497091001510853,182.74421871348966,2827,5691,3
294919191,549931427,0.0014371760007634293,92.76809036038416,2827,5691,3
473666784,1574635372,0.0056032360007520765,468.3819988021434,2827,5691,3
321209227,6908124636,0.002890858999307966,229.51616972555465,2827,5691,3
317841012,292485286,0.0113312590001442,288.05111883053104,2827,5691,3
2639898838,2611606215,0.008020106999538257,372.67570264869573,2827,5691,3
360747762,1830470692,0.022059930000978056,1009.4538720402156,2827,5691,3
2608678897,5023014974,0.013917351001509815,440.0800197153627,2827,5691,3
360747836,474997352,0.004605366000760114,476.7818535757649,2827,5691,3
317838183,360747691,0.024814899999910267,888.0361882245362,2827,5691,3
evaluation/results/example/queries/charge.csv
+ 30
− 32
View file @ d9ab9974
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
418009800,574457854,0.33510476099945663,None,2828,5691,1
1934189643,1672267862,0.012840351999329869,None,2827,5691,1
4955445788,2608597329,0.01045286299995496,None,2828,5691,1
3111465599,426948327,0.42038153800058353,None,2827,5691,1
426930250,360747525,0.03632907799874374,None,2828,5691,1
2626105675,574449298,0.16826632900119876,None,2827,5691,1
2608501851,418009810,0.28878574400005164,311.5216253485141,2828,5691,1
1718397716,294919195,0.588220438999997,19410.47441813424,2827,5691,1
405229458,748845494,0.14829701700000442,241.74032174316505,2828,5691,1
5726327175,5576939249,0.11976762000085728,133.7762557564627,2827,5691,1
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
418009800,574457854,0.33343001899993396,None,2828,5691,2
1934189643,1672267862,0.012630760998945334,None,2827,5691,2
4955445788,2608597329,0.010600056000839686,None,2828,5691,2
3111465599,426948327,0.429355864000172,None,2827,5691,2
426930250,360747525,0.03632738200030872,None,2828,5691,2
2626105675,574449298,0.17084869800055458,None,2827,5691,2
2608501851,418009810,0.29104091499903006,311.5216253485141,2828,5691,2
1718397716,294919195,0.5826008940002794,19410.47441813424,2827,5691,2
405229458,748845494,0.14460836600119364,241.74032174316505,2828,5691,2
5726327175,5576939249,0.11788628400063317,133.7762557564627,2827,5691,2
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
418009800,574457854,0.3407406269998319,None,2828,5691,3
1934189643,1672267862,0.01283182599945576,None,2827,5691,3
4955445788,2608597329,0.010952074000670109,None,2828,5691,3
3111465599,426948327,0.754869055999734,None,2827,5691,3
426930250,360747525,0.03519974899973022,None,2828,5691,3
2626105675,574449298,0.33222086900059367,None,2827,5691,3
2608501851,418009810,0.3017630939993978,311.5216253485141,2828,5691,3
1718397716,294919195,0.6059926620000624,19410.47441813424,2827,5691,3
405229458,748845494,0.17973764000089432,241.74032174316505,2828,5691,3
5726327175,5576939249,0.11767219800094608,133.7762557564627,2827,5691,3
418009821,6908239938,0.04698174700024538,182.74421871348966,2828,5691,1
294919191,549931427,0.018490039999960572,92.76809036038416,2827,5691,1
473666784,1574635372,0.2812119329992129,None,2828,5691,1
321209227,6908124636,0.047539414999846485,229.51616972555465,2827,5691,1
317841012,292485286,0.21624977700048476,None,2828,5691,1
2639898838,2611606215,0.3115172079997137,None,2827,5691,1
360747762,1830470692,0.00558476800142671,None,2828,5691,1
2608678897,5023014974,0.3217249669996818,None,2827,5691,1
360747836,474997352,0.005810935999761568,None,2828,5691,1
317838183,360747691,0.38367961200128775,None,2827,5691,1
418009821,6908239938,0.016021462999560754,182.74421871348966,2828,5691,2
294919191,549931427,0.044748398000592715,92.76809036038416,2827,5691,2
473666784,1574635372,0.2832638270010648,None,2828,5691,2
321209227,6908124636,0.048046101999716484,229.51616972555465,2827,5691,2
317841012,292485286,0.22368108500086237,None,2828,5691,2
2639898838,2611606215,0.3065842280011566,None,2827,5691,2
360747762,1830470692,0.005662692999976571,None,2828,5691,2
2608678897,5023014974,0.41433843999948294,None,2827,5691,2
360747836,474997352,0.005746419999923091,None,2828,5691,2
317838183,360747691,0.5245090529988374,None,2827,5691,2
418009821,6908239938,0.015582243000608287,182.74421871348966,2828,5691,3
294919191,549931427,0.043696627999452176,92.76809036038416,2827,5691,3
473666784,1574635372,0.28800436399978935,None,2828,5691,3
321209227,6908124636,0.0477621400004864,229.51616972555465,2827,5691,3
317841012,292485286,0.4295121149989427,None,2828,5691,3
2639898838,2611606215,0.3081414130010671,None,2827,5691,3
360747762,1830470692,0.005677651999576483,None,2828,5691,3
2608678897,5023014974,0.681346660001509,None,2827,5691,3
360747836,474997352,0.005859867000253871,None,2828,5691,3
317838183,360747691,0.6626464320015657,None,2827,5691,3
evaluation/results/example/queries/classic.csv
+ 30
− 32
View file @ d9ab9974
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,dijkstra_rank
418009800,574457854,0.004828957000427181,513.3867017835531,2827,5691,1,0
1934189643,1672267862,0.005808068000987987,None,2827,5691,1,0
4955445788,2608597329,0.001732140999592957,468.61012521592113,2827,5691,1,0
3111465599,426948327,0.005730105000111507,733.6313989681807,2827,5691,1,0
426930250,360747525,0.002913627000452834,730.4096032452347,2827,5691,1,0
2626105675,574449298,0.004262749000190524,581.5878060414734,2827,5691,1,0
2608501851,418009810,0.0028825260014855303,311.5216253485141,2827,5691,1,0
1718397716,294919195,0.002073088999168249,316.4427340861574,2827,5691,1,0
405229458,748845494,0.0025266470001952257,241.74032174316505,2827,5691,1,0
5726327175,5576939249,0.0016190309997909935,133.7762557564627,2827,5691,1,0
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,dijkstra_rank
418009800,574457854,0.004759720000947709,513.3867017835531,2827,5691,2,0
1934189643,1672267862,0.005909605999477208,None,2827,5691,2,0
4955445788,2608597329,0.001711437000267324,468.61012521592113,2827,5691,2,0
3111465599,426948327,0.005789236000055098,733.6313989681807,2827,5691,2,0
426930250,360747525,0.0029222049997770227,730.4096032452347,2827,5691,2,0
2626105675,574449298,0.004599191001034342,581.5878060414734,2827,5691,2,0
2608501851,418009810,0.003021403001184808,311.5216253485141,2827,5691,2,0
1718397716,294919195,0.002083249999486725,316.4427340861574,2827,5691,2,0
405229458,748845494,0.002550164001149824,241.74032174316505,2827,5691,2,0
5726327175,5576939249,0.001533010999992257,133.7762557564627,2827,5691,2,0
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,dijkstra_rank
418009800,574457854,0.004621473999577574,513.3867017835531,2827,5691,3,0
1934189643,1672267862,0.005740635999245569,None,2827,5691,3,0
4955445788,2608597329,0.0018071670001518214,468.61012521592113,2827,5691,3,0
3111465599,426948327,0.005631329000607366,733.6313989681807,2827,5691,3,0
426930250,360747525,0.0028826800007664133,730.4096032452347,2827,5691,3,0
2626105675,574449298,0.004391055999803939,581.5878060414734,2827,5691,3,0
2608501851,418009810,0.0030651209999632556,311.5216253485141,2827,5691,3,0
1718397716,294919195,0.0022838530003355118,316.4427340861574,2827,5691,3,0
405229458,748845494,0.0025572689992259257,241.74032174316505,2827,5691,3,0
5726327175,5576939249,0.0016318019988830201,133.7762557564627,2827,5691,3,0
418009821,6908239938,0.0003779149992624298,182.74421871348966,2827,5691,1,0
294919191,549931427,0.0003987099989899434,92.76809036038416,2827,5691,1,0
473666784,1574635372,0.0020754390006914036,468.3819988021434,2827,5691,1,0
321209227,6908124636,0.0008556659995520022,229.51616972555465,2827,5691,1,0
317841012,292485286,0.0031003759995655855,288.05111883053104,2827,5691,1,0
2639898838,2611606215,0.003385711001101299,372.67570264869573,2827,5691,1,0
360747762,1830470692,0.005332377000740962,1009.4538720402156,2827,5691,1,0
2608678897,5023014974,0.004551508000076865,440.0800197153627,2827,5691,1,0
360747836,474997352,0.0015595470013067825,476.7818535757649,2827,5691,1,0
317838183,360747691,0.005889654999919003,888.0361882245362,2827,5691,1,0
418009821,6908239938,0.0003629060011007823,182.74421871348966,2827,5691,2,0
294919191,549931427,0.00042678099998738617,92.76809036038416,2827,5691,2,0
473666784,1574635372,0.0020605459994840203,468.3819988021434,2827,5691,2,0
321209227,6908124636,0.0008044229998631636,229.51616972555465,2827,5691,2,0
317841012,292485286,0.0032580499992036493,288.05111883053104,2827,5691,2,0
2639898838,2611606215,0.003719599000760354,372.67570264869573,2827,5691,2,0
360747762,1830470692,0.005591068000285304,1009.4538720402156,2827,5691,2,0
2608678897,5023014974,0.004538948000117671,440.0800197153627,2827,5691,2,0
360747836,474997352,0.0016001120002329117,476.7818535757649,2827,5691,2,0
317838183,360747691,0.006867553000120097,888.0361882245362,2827,5691,2,0
418009821,6908239938,0.0003596300011849962,182.74421871348966,2827,5691,3,0
294919191,549931427,0.0003971090009144973,92.76809036038416,2827,5691,3,0
473666784,1574635372,0.002105782999933581,468.3819988021434,2827,5691,3,0
321209227,6908124636,0.0009097740003198851,229.51616972555465,2827,5691,3,0
317841012,292485286,0.003172266000547097,288.05111883053104,2827,5691,3,0
2639898838,2611606215,0.0034531430010247277,372.67570264869573,2827,5691,3,0
360747762,1830470692,0.005479954999827896,1009.4538720402156,2827,5691,3,0
2608678897,5023014974,0.004539076999208191,440.0800197153627,2827,5691,3,0
360747836,474997352,0.001553107998915948,476.7818535757649,2827,5691,3,0
317838183,360747691,0.005794718001197907,888.0361882245362,2827,5691,3,0
evaluation/results/example/queries/gasstation.csv
+ 30
− 32
View file @ d9ab9974
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,time_contracted_graph,time_state_graph
418009800,574457854,0.016529435999473208,513.3867017835531,2827,5691,1,9.77930012595607e-05,2.879800013033673e-05
1934189643,1672267862,0.024617869001303916,None,2827,5691,1,None,None
4955445788,2608597329,0.006554030000188504,468.61012521592113,2827,5691,1,None,None
3111465599,426948327,0.023431165000147303,733.6313989681807,2827,5691,1,None,None
426930250,360747525,0.010238357999696746,730.4096032452347,2827,5691,1,None,None
2626105675,574449298,0.017239513999811606,581.5878060414734,2827,5691,1,None,None
2608501851,418009810,0.009257375000743195,311.5216253485141,2827,5691,1,None,None
1718397716,294919195,0.00842110699886689,316.4427340861574,2827,5691,1,None,None
405229458,748845494,0.007098027999745682,241.74032174316505,2827,5691,1,None,None
5726327175,5576939249,0.005705544999727863,133.7762557564627,2827,5691,1,None,None
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,time_contracted_graph,time_state_graph
418009800,574457854,0.016138078000949463,513.3867017835531,2827,5691,2,0.004825021000215202,6.158799988043029e-05
1934189643,1672267862,0.026505159999942407,None,2827,5691,2,None,None
4955445788,2608597329,0.006831624999904307,468.61012521592113,2827,5691,2,None,None
3111465599,426948327,0.022835116998976446,733.6313989681807,2827,5691,2,None,None
426930250,360747525,0.010438203999001416,730.4096032452347,2827,5691,2,None,None
2626105675,574449298,0.015608510999300051,581.5878060414734,2827,5691,2,None,None
2608501851,418009810,0.0089906039993366,311.5216253485141,2827,5691,2,None,None
1718397716,294919195,0.007416918999297195,316.4427340861574,2827,5691,2,None,None
405229458,748845494,0.007365741999819875,241.74032174316505,2827,5691,2,None,None
5726327175,5576939249,0.005357400001230417,133.7762557564627,2827,5691,2,None,None
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,time_contracted_graph,time_state_graph
418009800,574457854,0.016169999000339885,513.3867017835531,2827,5691,3,0.03335488100128714,0.00013285199929669034
1934189643,1672267862,0.024665127999469405,None,2827,5691,3,None,None
4955445788,2608597329,0.006551911999849835,468.61012521592113,2827,5691,3,None,None
3111465599,426948327,0.022852780000903294,733.6313989681807,2827,5691,3,None,None
426930250,360747525,0.01021414099886897,730.4096032452347,2827,5691,3,None,None
2626105675,574449298,0.015425386000060826,581.5878060414734,2827,5691,3,None,None
2608501851,418009810,0.009126294000452617,311.5216253485141,2827,5691,3,None,None
1718397716,294919195,0.007759873000395601,316.4427340861574,2827,5691,3,None,None
405229458,748845494,0.00701812700026494,241.74032174316505,2827,5691,3,None,None
5726327175,5576939249,0.005257716000414803,133.7762557564627,2827,5691,3,None,None
418009821,6908239938,0.0015042989998619305,182.74421871348966,2827,5691,1,8.900300053937826e-05,2.7534000764717348e-05
294919191,549931427,0.0014210820008884184,92.76809036038416,2827,5691,1,8.900300053937826e-05,2.7534000764717348e-05
473666784,1574635372,0.005654513000990846,468.3819988021434,2827,5691,1,8.900300053937826e-05,2.7534000764717348e-05
321209227,6908124636,0.002979900998980156,229.51616972555465,2827,5691,1,8.900300053937826e-05,2.7534000764717348e-05
317841012,292485286,0.010838958000022103,288.05111883053104,2827,5691,1,8.900300053937826e-05,2.7534000764717348e-05
2639898838,2611606215,0.007842952001738013,372.67570264869573,2827,5691,1,8.900300053937826e-05,2.7534000764717348e-05
360747762,1830470692,0.023959889000252588,1009.4538720402156,2827,5691,1,8.900300053937826e-05,2.7534000764717348e-05
2608678897,5023014974,0.013893295999878319,440.0800197153627,2827,5691,1,8.900300053937826e-05,2.7534000764717348e-05
360747836,474997352,0.005398225999670103,476.7818535757649,2827,5691,1,8.900300053937826e-05,2.7534000764717348e-05
317838183,360747691,0.02491281400034495,888.0361882245362,2827,5691,1,8.900300053937826e-05,2.7534000764717348e-05
418009821,6908239938,0.0013870740003767423,182.74421871348966,2827,5691,2,0.017653894999966724,6.468999890785199e-05
294919191,549931427,0.0015598760001012124,92.76809036038416,2827,5691,2,0.017653894999966724,6.468999890785199e-05
473666784,1574635372,0.0055939130015758565,468.3819988021434,2827,5691,2,0.017653894999966724,6.468999890785199e-05
321209227,6908124636,0.0029180599995015655,229.51616972555465,2827,5691,2,0.017653894999966724,6.468999890785199e-05
317841012,292485286,0.010899884999162168,288.05111883053104,2827,5691,2,0.017653894999966724,6.468999890785199e-05
2639898838,2611606215,0.00826251900070929,372.67570264869573,2827,5691,2,0.017653894999966724,6.468999890785199e-05
360747762,1830470692,0.022464121000666637,1009.4538720402156,2827,5691,2,0.017653894999966724,6.468999890785199e-05
2608678897,5023014974,0.0145577660005074,440.0800197153627,2827,5691,2,0.017653894999966724,6.468999890785199e-05
360747836,474997352,0.00476558900118107,476.7818535757649,2827,5691,2,0.017653894999966724,6.468999890785199e-05
317838183,360747691,0.02601139000034891,888.0361882245362,2827,5691,2,0.017653894999966724,6.468999890785199e-05
418009821,6908239938,0.001344002001133049,182.74421871348966,2827,5691,3,0.03282055800082162,0.0001372620008623926
294919191,549931427,0.001496675999078434,92.76809036038416,2827,5691,3,0.03282055800082162,0.0001372620008623926
473666784,1574635372,0.0055375779993482865,468.3819988021434,2827,5691,3,0.03282055800082162,0.0001372620008623926
321209227,6908124636,0.0032612319992040284,229.51616972555465,2827,5691,3,0.03282055800082162,0.0001372620008623926
317841012,292485286,0.01118872099868895,288.05111883053104,2827,5691,3,0.03282055800082162,0.0001372620008623926
2639898838,2611606215,0.00899679299982381,372.67570264869573,2827,5691,3,0.03282055800082162,0.0001372620008623926
360747762,1830470692,0.023903094999695895,1009.4538720402156,2827,5691,3,0.03282055800082162,0.0001372620008623926
2608678897,5023014974,0.013956917999166762,440.0800197153627,2827,5691,3,0.03282055800082162,0.0001372620008623926
360747836,474997352,0.004753840001285425,476.7818535757649,2827,5691,3,0.03282055800082162,0.0001372620008623926
317838183,360747691,0.025178341998980613,888.0361882245362,2827,5691,3,0.03282055800082162,0.0001372620008623926
evaluation/run.py
+ 3
− 6
View file @ d9ab9974
......@@ -33,11 +33,9 @@ def query_benchmark(graphs, conf, result_dir):
]
# Remove existing results
for _, filename, _ in query_conf:
try:
result_dir.joinpath(filename).unlink()
except FileNotFoundError:
pass
for _, filename, row_class in query_conf:
with result_dir.joinpath(filename).open('w') as f:
write_head(f, row_class)
for map_name, G in zip(conf['maps'], graphs):
nodes = random.sample(list(G.nodes), k=2 * conf['queries_per_setup'])
......@@ -53,7 +51,6 @@ def query_benchmark(graphs, conf, result_dir):
map_name
))
with result_dir.joinpath(filename).open('a') as f:
write_head(f, row_class)
for s, t in zip(start_nodes, target_nodes):
write_row(f, func(G, setup, s, t))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment