Merge remote-tracking branch 'origin/helmet5-car-parameters' into helmet5-experimental

Author: hsl-petrhaj

Scripts/parameters/car.py

@@ -20,31 +20,31 @@
     "oop": 0.604623955305384,
 }
 car_usage: Dict[str,Any] = {
-    "constant": -0.8551,
+    "constant": -1.0477,
     "generation": {},
     "log": {
-        "cars_per_1000": 0.6490,
-        "population_density": -0.3684,
+        "cars_per_1000": 0.6475,
+        "population_density": -0.3436,
     },
     "individual_dummy": {
         "age_7-17": -9999,
-        ("age_18-29", "male"): 0.0,
-        ("age_30-49", "female"): 0.6795,
-        ("age_30-49", "male"): 1.1779,
-        ("age_50-64", "female"): 0.7980,
-        ("age_50-64", "male"): 1.6197,
-        ("age_65-99", "male"): 1.4483,
+        ("age_18-29", "male"): -0.0890,
+        ("age_30-49", "female"): 0.6808,
+        ("age_30-49", "male"): 1.1759,
+        ("age_50-64", "female"): 0.8005,
+        ("age_50-64", "male"): 1.6203,
+        ("age_65-99", "male"): 1.4475,
     },
 }
 car_density = {
     "constant": 0.0,
     "generation": {
-        "share_detached_houses_new": 3.500e-01, # Originally estimated for percentages (0-100), here transformed
-        "helsinki": 1.411e-01,
-        "surrounding": 1.823e-01,
+        "share_detached_houses_new": 4.241e-01, # Originally estimated for percentages (0-100), here transformed
+        "helsinki": 1.248e-01,
+        "surrounding": 1.733e-01,
     },
     "log": {
-        "time_ratio": 1.273e-01,
-        "cost_ratio": 1.273e-01,
+        "time_ratio": 1.284e-01,
+        "cost_ratio": 1.284e-01,
     },
 }