Reverted some calibration back as it made length distribution worse. Introduced some more transit constant penalty for surrounding municipalities.

Author: hsl-petrhaj

Scripts/parameters/mode_choice.py

@@ -43,7 +43,7 @@
             }
         },
         "transit": {
-            "constant": (4.026594698031273, 4.026594698031273),
+            "constant": (4.026594698031273, 3.127507661511273),
             "log": {
                 "logsum": 0.89908703652
             },
@@ -267,7 +267,7 @@
             }
         },
         "transit": {
-            "constant": (3.9593014770936366, 3.4328608648036365),
+            "constant": (3.4328608648036365, 2.9064202525136364),
             "log": {
                 "logsum": 0.52644061229
             },
@@ -285,7 +285,7 @@
             }
         },
         "bike": {
-            "constant": (2.669848382655192, 3.459509301090192),
+            "constant": (1.985475586678192, 2.775136505113192),
             "log": {
                 "logsum": 0.52644061229
             },
@@ -342,7 +342,7 @@
             }
         },
         "transit": {
-            "constant": (1.3087752722013022, -1.714566704646698),
+            "constant": (1.3087752722013022, -2.470402198858698),
             "log": {
                 "logsum": 0.377917747106
             },
@@ -361,7 +361,7 @@
             }
         },
         "bike": {
-            "constant": (-0.34247434025287116, -0.34247434025287116),
+            "constant": (0.7912789010651289, 0.7912789010651289),
             "log": {
                 "logsum": 0.377917747106
             },

Scripts/tests/integration/test_models.py

@@ -54,7 +54,7 @@ def test_models(self):
         self._validate_impedances(impedance["iht"])
 
         # Check that model result does not change
-        self.assertAlmostEquals(model.mode_share[0]["car"], 0.2869964081260768)
+        self.assertAlmostEquals(model.mode_share[0]["car"], 0.2926169448883333)
 
         print("Model system test done")