add optimized berlin network params

matsim-scenarios · Apr 7, 2024 · 91439ff · 91439ff
1 parent 13da2b0
commit 91439ff
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/input/v6.2/berlin-v6.2-routes-ref.csv.gz b/input/v6.2/berlin-v6.2-routes-ref.csv.gz
diff --git a/src/main/java/org/matsim/prepare/network/BerlinNetworkParams_speedRelative_priority.java b/src/main/java/org/matsim/prepare/network/BerlinNetworkParams_speedRelative_priority.java
@@ -8,7 +8,7 @@
 public final class BerlinNetworkParams_speedRelative_priority implements FeatureRegressor {
 
     public static BerlinNetworkParams_speedRelative_priority INSTANCE = new BerlinNetworkParams_speedRelative_priority();
-    public static final double[] DEFAULT_PARAMS = {0.15724492, 0.19273548, 0.18403086, 0.19157858, 0.16120821, 0.1980568, 0.17025721, 0.14275415, 0.11048176, 0.102709346, 0.06792478, 0.10821823, 0.09011285, 0.08277143, 0.09243622, 0.09845659, 0.06138229, 0.06789871, 0.057023786, 0.045561712, 0.040391147, 0.054062303, 0.0, 0.040396813, 0.035386518, 0.0, 0.042849354, 0.0466025, 0.035123896, 0.0, 0.016435765, 0.0, 0.0, 0.019191166, 0.040614914, 0.027222177, 0.0048989994, 0.035677213, 0.021704927, 0.015032333, 0.031955387, 0.01666849, 0.0074288645, 0.014110131, 0.024576068, 0.010005573, 0.041455485, 0.025570804, 0.017918263, 0.0, 0.0, 0.01256823, 0.015104672, -0.012481432, 0.00536652, 0.009893488, 0.009986547, 0.018633667, 0.012301514, 0.0055723884, -0.0042632725, 0.009677288, 0.0015550333, 0.006243969, -0.0037499985, 0.0032326714, 0.0217748, 0.0048877522, -0.01280412, 0.0, 0.011345619, 0.0, 0.0, 0.0035977655, -0.008411235, 0.0, 0.01370504, -0.0006115317, 0.007350211, 0.0014637669, 0.005347326, 0.0020510554, 0.005052541, -0.0014409187, 0.0018602, -0.0016169732, 0.0031055745, -0.0056220083, 0.011374512, 0.0, 0.001966972, -0.0028674304, 0.0020517444, 0.00076617644, -0.0046325005, -0.004758692, 0.0012792036, -0.008385347, 0.0, 0.002726265, 0.00020829745, 0.0, 0.0, -0.0082345735, 0.0, -0.035001624, -0.0050901906, 0.0, -0.0017592426, 0.00027184488, -0.0030666916, -0.013880559, 0.0053953347, 0.0035018784, 0.00045144613, 8.061571e-05, -0.0033695176, 0.0030606918, 0.00033529464, -0.004963807, 0.010418295, -0.00029751126, -0.006895263, 0.00044846663, 0.0026161217, -0.021911642, -0.0044968612, 0.0, -0.0012206174, -0.025058791, 0.0042696362, -0.0005126147, 0.0004962817, -0.00077095797, 0.002565097, 0.0, -0.006931564, 0.0, -0.022092693, -0.007780278, 0.0007043617, -0.0008171179, -0.002066162, 0.008384691, 0.0011571822, 0.00027108335, -0.0009287675, 0.006082932, 0.0028573114, -0.00846794, 0.00018975107, 0.0045378944, -0.0011339803, 0.005224601, -6.513751e-05, 0.0, 0.0, -0.018269084, 0.0034695654, -0.00026458103, -0.0027475485, 0.0068913423, 0.0, -0.012815217, 0.00026853607, -0.0027989408, 0.00024086394, 0.0066861873, 0.0, 6.4727988e-06, -0.0014501911, -0.002494975, 0.0015008535, -0.00049155444, 0.0067627244, -0.0014077883, 0.0015698029, 0.0, -0.010308943, -0.0009068087, 0.0, 0.0027998113, -0.0046737837, 0.00012720711, -0.0042179585, 0.003662557, -0.0012615945, 0.00192968, 3.7585372e-07, 9.2846225e-05, 0.013026616, -0.008578217, -0.005248636, -0.0036968153, 0.0003156052, 0.0024093715, -0.0003495667, -0.00030448436, -3.8445793e-05, 0.0, -0.024849607, 0.00016108007, 0.015603923, 0.0, -0.0035782477, -2.18532e-05, -0.009707966, 0.0, 0.0041826395, -0.0035536666, 0.004105262, 0.010043072, 0.00020426886, 3.1741417e-06, 0.00572087, -0.0007401902, 0.0, -0.0108033465, -0.013462666, -0.001430584, -0.00095125375, 4.312593e-05, 0.00028308886, 0.0037140378, 0.00079021766, -0.005122026, -0.0013027412, -0.0047874786, 0.0041786814, -0.0005791032, -0.008750576, 0.0137136765, 4.2379565e-06, 0.0030340564, -0.021573383, -0.0009175329, 0.00065593724, -0.0048078895, 0.00050423876, 0.0017348679, -0.010162599, 0.00016265023, 0.0029644673, -0.008102837, 0.0024075173, -1.6770764e-05, 0.00025584106, -3.6568855e-07, -0.0074612647, 0.011033748, 0.0, 0.007791925, -0.019453187, 0.0005933511, 0.0024033622, -0.0007407156, -0.0063573257, 0.0012771342, 0.0044823387, -0.0023863865, 4.71596e-05, 0.000489205, -0.0005635803, -3.7119185e-05, 0.0027739953, -0.0083763795, -0.02207759, -0.002804457, 0.015720833, 0.0, 0.0007142104, -3.4262026e-05, 0.005516721, -0.0006166697, 0.0, 0.0132253505, 0.0, -0.0045134304, 0.0060599926, -0.00045232018};
+    public static final double[] DEFAULT_PARAMS = {0.12550950050354004, 0.189355731010437, 0.17886589467525482, 0.15100084245204926, 0.16275350749492645, 0.22602279484272003, 0.15281672775745392, 0.15926821529865265, 0.07377482205629349, 0.08893188834190369, 0.091558538377285, 0.09821221232414246, 0.10520006716251373, 0.0773724764585495, 0.11609984934329987, 0.11544670909643173, 0.057235196232795715, 0.07558291405439377, 0.009422936476767063, 0.008980573154985905, 0.05040629580616951, 0.08543317019939423, -0.006561304908245802, -0.005893743131309748, -0.004282128997147083, -0.026850620284676552, 0.054473187774419785, 0.08489955961704254, 0.01490788534283638, 0.006346927955746651, 0.02943824604153633, 0.008724082261323929, -0.026141716167330742, -0.033894672989845276, 0.04418030381202698, 0.01323855109512806, 0.004540024790912867, 0.012382707558572292, 0.04508198797702789, -0.004851947072893381, 0.03212041035294533, 0.018353469669818878, 0.015060266479849815, -0.01619911752641201, 0.06256382167339325, 0.012398114427924156, 0.04449858516454697, -0.018833644688129425, 0.015152745880186558, 0.01700606942176819, -0.02672872692346573, 0.0416702926158905, 0.010799357667565346, -0.07898901402950287, 0.006450137123465538, -0.005750605836510658, -0.014523745514452457, -0.04408177360892296, 0.04883847013115883, -0.022843588143587112, -0.023223113268613815, -0.019399531185626984, 0.021782495081424713, 0.019667288288474083, -0.02515421062707901, -0.00809520948678255, 0.06308271735906601, -0.0023248018696904182, 0.015324900858104229, -0.010448208078742027, -0.005368105135858059, 0.0036487847100943327, 0.014546352438628674, -0.010148151777684689, -0.011488407850265503, 0.011713712476193905, 0.03729243949055672, -0.028871363028883934, -0.020864658057689667, 0.0068322136066854, 0.026309804990887642, -0.008680366910994053, 0.009399128146469593, -0.06411990523338318, 0.0028396653942763805, -0.027854491025209427, 0.0044095274060964584, 0.0025082863867282867, 0.02044624462723732, 0.005750803276896477, -0.0233260877430439, -0.017139121890068054, 0.01264281664043665, -0.013013861142098904, 0.0036902816500514746, 0.03193708509206772, 0.0081612728536129, -0.04379268363118172, -0.016621025279164314, 0.01968771405518055, -0.016309073194861412, -0.01988919824361801, -0.022129802033305168, -0.0036659406032413244, -0.054972246289253235, -0.048217542469501495, 0.013189898803830147, -0.023465821519494057, -0.014551885426044464, -0.01085179764777422, -0.004108797758817673, -0.021892372518777847, 0.038366325199604034, -0.00669700326398015, -0.002341065788641572, -0.012381287291646004, -0.003254153998568654, 0.018539857119321823, -0.004215467255562544, 0.006622281391173601, 0.025530768558382988, -0.010200202465057373, -0.015365288592875004, -0.043065737932920456, -0.0172751322388649, 0.00842320080846548, -0.013684536330401897, 0.006557685323059559, 0.02774382010102272, -0.04138639569282532, 0.014490441419184208, 0.029965436086058617, -0.02057560347020626, 0.008018595166504383, -0.07125191390514374, -0.013040341436862946, 0.025720685720443726, 0.034274134784936905, -0.007738122250884771, -0.02914026565849781, 0.002046799287199974, 0.002551571000367403, 0.003382128896191716, -0.013111705891788006, 0.010415175929665565, 0.022097080945968628, -0.038005538284778595, -0.0016290235798805952, -0.03373470902442932, 0.008343146182596684, -0.031475234776735306, 0.03533920645713806, -0.02184664085507393, 0.04885302484035492, -0.011739714071154594, -0.043699465692043304, -0.006461615674197674, 0.0024099647998809814, 0.001549588399939239, 0.002348459791392088, 0.0012500251177698374, -0.015067570842802525, 0.006313795689493418, 0.0053595551289618015, 0.04169558733701706, -0.010738281533122063, -0.024225503206253052, -0.03299573063850403, -0.02137511409819126, 0.0010198460659012198, 0.01464577205479145, -0.010252954438328743, 0.010739730671048164, -0.016007104888558388, -0.0064740474335849285, -0.011928597465157509, 0.01651456579566002, -0.007379315327852964, -0.05368182808160782, -0.0026138005778193474, -0.00727581512182951, -0.026764769107103348, -0.014498701319098473, 0.0025670919567346573, 0.007335836533457041, -0.0023193827364593744, -0.020489776507019997, 0.022850999608635902, -0.011527427472174168, -0.047909364104270935, 0.013235253281891346, 0.027461105957627296, -0.03219754993915558, -0.020433438941836357, 0.007957947440445423, 0.02916964516043663, -0.01599435694515705, -0.02039303071796894, -0.005623361561447382, 0.037930265069007874, -0.02354472316801548, 0.013999874703586102, -0.01911725476384163, -0.014107367023825645, 0.011351631954312325, -0.003752398770302534, -0.02974548190832138, -0.04380866512656212, 0.01848854497075081, 0.006680892314761877, 0.004972042050212622, 0.03653397038578987, -0.011084431782364845, -0.006494482047855854, 0.020584935322403908, -0.003768667345866561, -3.340105104143731e-05, -0.029125778004527092, 0.006228133104741573, 0.008600886911153793, -0.033562663942575455, -0.0025175928603857756, 0.016567666083574295, -0.027320487424731255, 0.017588986083865166, 0.0015938619617372751, -0.012684625573456287, 0.01542857475578785, 0.013579197227954865, -0.01283981278538704, -0.03461580350995064, -0.02341916412115097, -0.005692454520612955, -0.0031673801131546497, -0.029014386236667633, -0.0018230746500194073, -0.004706212785094976, 0.011962894350290298, 0.011240237392485142, 0.015453718602657318, 0.011790980584919453, -0.01706736907362938, -0.03504134342074394, -0.06385992467403412, -0.014527950435876846, -0.0013383073965087533, 0.021808616816997528, -0.008378241211175919, -0.0390448197722435, -0.02441360056400299, -0.03476740047335625, 0.02811412513256073, -0.011769075877964497, 0.004476679023355246, 0.004439139738678932, -0.009369712322950363, 0.01290037203580141, 0.038308948278427124, -0.0024049500934779644, -0.04359044134616852, 0.010047076269984245, -0.016951922327280045, -0.017950627952814102, 0.0002252952690469101, -0.0859515517950058, 0.012960616499185562, -0.009868291206657887, 0.020009377971291542, 0.01893169991672039, 0.014683406800031662, -0.0030375521164387465, -0.001094939187169075, -0.022562043741345406, -0.013336949981749058, 0.0033218443859368563, -0.007926808670163155, -0.015716295689344406, -0.008151188492774963, -0.05472773686051369, -0.07977693527936935};
 
     @Override
     public double predict(Object2DoubleMap<String> ft) {

diff --git a/.../java/org/matsim/prepare/network/BerlinNetworkParams_speedRelative_right_before_left.java b/.../java/org/matsim/prepare/network/BerlinNetworkParams_speedRelative_right_before_left.java
@@ -8,7 +8,7 @@
 public final class BerlinNetworkParams_speedRelative_right_before_left implements FeatureRegressor {
 
     public static BerlinNetworkParams_speedRelative_right_before_left INSTANCE = new BerlinNetworkParams_speedRelative_right_before_left();
-    public static final double[] DEFAULT_PARAMS = {0.8646015117982583, 0.8788410625723447, 0.8484615384615384, 0.945952380952381, 0.8242520350020349, 0.8464025000000001, 0.8659559502272193, 0.8851620039682541, 0.8854518342303758, 0.9036853232070694, 0.8808906070032868, 0.872854898457248, 0.9044877414925957, 0.8882173312737994, 0.8725341191417284, 0.8904124999999997, 0.8766650168909327, 0.95, 0.841978021978022, 0.9156062500000001, 0.7878571428571428, 0.8427712711265344, 0.8648233821407353, 0.8876901544401542, 0.883205103692242, 0.8646209972822875, 0.8866945551896072, 0.8473611111111112, 0.8831034482758621, 0.947572549019608, 0.9169444444444443, 0.858, 0.8815480769230769, 0.8442475052521007, 0.8791538686343874, 0.9170643939393941, 0.8552576260838972, 0.8228541666666666, 0.8655722718142072, 0.8228571428571427, 0.8846874505658122, 0.8803174156285094, 0.89547561762474, 0.8859449046872315, 0.9583333333333334, 0.8745461096443238, 0.81, 0.8613491295425671, 0.8801602372823522, 0.8972979242979244, 0.9307508116883118, 0.8521188716101303, 0.8238969696969697, 0.8798309523809525, 0.8591700823789435, 0.8233333333333333, 0.775, 0.89, 0.8530980392156863, 0.8833953014408202, 0.8859223703206229, 0.8855555555555557, 0.9439956896551724, 0.9228888888888889, 0.8783163410683079, 0.8604195804195804, 0.9267001262626261, 0.8281261581555698, 0.8477010869565219, 0.8666127761824998, 0.8062962962962963, 0.84, 0.83, 0.8183333333333334, 0.8853516286666312, 0.8805828454301285, 0.8871780218515735, 0.8768336002207475, 0.8638316796279627, 0.8226550733254063, 0.8773566710996508, 0.9227794011544013, 0.8507118505868506, 0.76, 0.867317187233316, 0.8889737274220032, 0.8850625631178106, 0.8704901477832513, 0.8791849007500389, 0.9340909090909091, 0.898711547291093, 0.9155819047619047, 0.8867853668262621, 0.8707731999800963, 0.8659184808203007, 0.88038522560916, 0.938935185185185, 0.8903836088154271, 0.8333437801833327, 0.76, 0.864311372655123, 0.8281666666666666, 0.7916666666666666, 0.8852040464273085, 0.8811688825317017, 0.9097142857142859, 0.9416666666666668, 0.8865754901134888, 0.835, 0.8557006531204645, 0.8779330792944756, 0.9231411152949612, 0.8818026315789473, 0.8398879629629631, 0.79, 0.8694108344163016, 0.7833333333333332, 0.8837289313753577, 0.887051019605796, 0.8555420168067227, 0.8775083476857672, 0.9176398467432951, 0.874, 0.97, 0.955, 0.8794895289863226, 0.8645938263125766, 0.8096666666666668, 0.9198954175905397, 0.9562499999999999, 0.918, 0.8626657599459774, 0.822037037037037, 0.8826614275944579, 0.8862027221096526, 0.8649898831327402, 0.8804261005414634, 0.9217642432653642, 0.8912820512820514, 0.97, 0.8868548356308275, 0.9259298245614033, 0.8635123963716513, 0.8782659865693775, 0.7993095238095239, 0.8433930386430386, 0.9460000000000001, 0.8666941731601728, 0.8322794117647059, 0.8844726660358417, 0.8703792582417583, 0.8853286661255411, 0.86, 0.9367663962136579, 0.975, 0.883190939869121, 0.8743693906754619, 0.8237655677655678, 0.9183613980716253, 0.8166904761904762, 0.8594422316924882, 0.8838009720684139, 0.806, 0.8853339766250385, 0.8812506179148929, 0.8628600185528758, 0.7999999999999999, 0.8878542845816493, 0.9633333333333333, 0.8777018713209191, 0.8266666666666668, 0.9316666666666666, 0.877054049516478, 0.8402930402930403, 0.9241172348484848, 0.945, 0.8337327999213593, 0.8649633698480658, 0.8134523809523808, 0.8840620595140162, 0.8572565864833905, 0.8876985803890554, 0.9355, 0.867561111111111, 0.8064285714285714, 0.9324999999999999, 0.8772805995015088, 0.8616292418980559, 0.8764349915696938, 0.8277216117216116, 0.9262029220779221, 0.846422560690943, 0.7988916666666667, 0.97, 0.8646500941575708, 0.8823639945193488, 0.8345238095238096, 0.7966666666666666, 0.8559901960784314, 0.8868004715687479, 0.9254051282051281, 0.9390000000000001, 0.8782161777941421, 0.8678469370796373, 0.8799823422307548, 0.8342978021978019, 0.8683570305983279, 0.75, 0.8839555839005792, 0.8864544178041903, 0.8099999999999999, 0.8647058823529412, 0.9041666666666667, 0.8816009852216748, 0.8980769230769231, 0.9506042780748661, 0.8869804203732776, 0.8543678750368408, 0.8785034662238783, 0.9150772357723577, 0.8510621882696062, 0.8648894198524483, 0.95, 0.8779582885785894, 0.8859811805275934, 0.853828125, 0.8772443936440636, 0.883097584153205, 0.9137179487179485, 0.8877334940237789, 0.868840953917877, 0.75};
+    public static final double[] DEFAULT_PARAMS = {0.8501698970794678, 0.9006523489952087, 0.8484615087509155, 0.9332157373428345, 0.9654031991958618, 0.7838205695152283, 0.9256957173347473, 0.9549677968025208, 0.8052073121070862, 0.8382558226585388, 0.9484443068504333, 0.9078091979026794, 0.9063796997070312, 0.8464484214782715, 0.8108808994293213, 0.9163745641708374, 0.941914439201355, 0.949999988079071, 0.8465233445167542, 0.8688034415245056, 0.8775915503501892, 0.9402863383293152, 0.9495895504951477, 0.8825960755348206, 0.8238087296485901, 0.9011247158050537, 0.8459143042564392, 0.8655627965927124, 0.8199752569198608, 0.8992147445678711, 0.7966489195823669, 0.8579999804496765, 0.8710649609565735, 0.7907753586769104, 0.9156076908111572, 0.8679876327514648, 0.9876474142074585, 0.794172465801239, 0.9140607714653015, 0.9037666320800781, 0.8168045878410339, 0.8536452651023865, 1.0151387453079224, 0.8642212152481079, 1.0296967029571533, 0.8043543696403503, 0.7827005386352539, 0.8400399684906006, 0.9112281799316406, 0.9027798771858215, 0.8668215870857239, 0.9703286290168762, 0.8510969877243042, 0.9588707685470581, 0.8380865454673767, 0.9060183167457581, 0.8086714148521423, 0.8899999856948853, 0.8702351450920105, 0.8167619705200195, 0.881017804145813, 0.8917708396911621, 0.8898671865463257, 0.9124057292938232, 0.9038119912147522, 0.8082835674285889, 0.9032228589057922, 0.9692773818969727, 0.7851191163063049, 0.9151013493537903, 0.8872057795524597, 0.8399999737739563, 0.8969735503196716, 0.8183333277702332, 0.7989745736122131, 0.9540218710899353, 0.8480196595191956, 0.8248308897018433, 0.8740478754043579, 0.7323729395866394, 0.9444176554679871, 0.8704118132591248, 0.96578049659729, 0.7970685362815857, 0.9479656219482422, 0.826766848564148, 0.7914180159568787, 0.8081436157226562, 0.8508738875389099, 0.9340909123420715, 0.9815088510513306, 0.9774714112281799, 0.8721084594726562, 0.8936017155647278, 0.85148686170578, 0.9024903178215027, 0.8605471849441528, 0.9828650951385498, 0.9500955939292908, 0.7599999904632568, 0.9269111156463623, 0.8720079660415649, 0.8653984069824219, 0.8197725415229797, 0.9061167240142822, 0.9564887285232544, 0.8769751191139221, 0.8558287024497986, 0.8147779107093811, 0.8483192324638367, 0.9398745894432068, 0.893629789352417, 0.8337939977645874, 0.964969277381897, 0.7900000214576721, 0.9434866905212402, 0.8190807104110718, 0.8359490036964417, 0.8498650789260864, 0.8630268573760986, 0.8285882472991943, 0.8156688809394836, 0.8775268793106079, 0.9993680119514465, 0.8820398449897766, 0.9098674654960632, 0.8552159070968628, 0.8126517534255981, 0.8735414743423462, 0.8983948826789856, 0.9142025709152222, 0.9788086414337158, 0.8658783435821533, 0.8190967440605164, 0.8848844170570374, 0.8562158346176147, 0.909334123134613, 0.8601728677749634, 0.7592419981956482, 1.0365158319473267, 0.8781071901321411, 0.847541868686676, 0.9003839492797852, 0.9481457471847534, 0.8890439867973328, 0.9426897168159485, 0.9181755781173706, 0.9372392892837524, 0.9060111045837402, 0.815224289894104, 0.7869310975074768, 0.9040620923042297, 0.8649681210517883, 0.8579493761062622, 1.0132747888565063, 0.8378110527992249, 0.9725226163864136, 0.8364429473876953, 0.8697134852409363, 0.9064249396324158, 0.9608400464057922, 0.9030491709709167, 0.8059999942779541, 0.7702260613441467, 0.9495320916175842, 0.7942577600479126, 0.8006508350372314, 0.8567498326301575, 0.9633333086967468, 0.815035343170166, 0.7993671894073486, 0.8521023392677307, 0.9075300097465515, 0.8529704213142395, 0.8750404715538025, 0.8677250742912292, 0.9662194848060608, 0.9261354804039001, 0.8400701284408569, 0.8164852857589722, 0.7565231323242188, 0.9053943753242493, 0.8107093572616577, 0.7893573641777039, 0.8567478060722351, 0.9325000047683716, 0.8400388360023499, 0.8383146524429321, 0.9119933843612671, 0.8517348170280457, 0.8734019994735718, 0.9788123369216919, 0.7063427567481995, 0.9700000286102295, 0.9358868598937988, 0.8132143020629883, 0.9118583798408508, 0.7074904441833496, 0.7708765268325806, 0.9016913771629333, 0.8006144762039185, 1.010364055633545, 0.8237125873565674, 0.8798007369041443, 0.8935883641242981, 0.9630178809165955, 0.9531705975532532, 0.75, 0.8560128808021545, 0.8395475149154663, 0.8837317228317261, 0.8818429708480835, 0.9545405507087708, 0.8352820873260498, 0.7400753498077393, 0.9284844994544983, 0.8388035297393799, 0.8536258339881897, 0.945603609085083, 0.8691257238388062, 0.9723203182220459, 0.9076040387153625, 0.949999988079071, 0.8989589810371399, 0.7738989591598511, 0.7819089293479919, 0.7974745035171509, 1.0653083324432373, 0.9143388271331787, 0.8224573731422424, 0.9618649482727051, 0.7823584675788879};
 
     @Override
     public double predict(Object2DoubleMap<String> ft) {