adjusting car share for ho model

HSLdevcom · Sep 12, 2024 · e17c9df · e17c9df
1 parent 889a2e8
commit e17c9df
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 31 deletions.
diff --git a/Scripts/parameters/destination_choice.py b/Scripts/parameters/destination_choice.py
@@ -305,10 +305,10 @@
                 "size": 1.0
             },
             "size": {
-                "cbd": 8568.994235814573,
-                "population": 0.08443759373342159,
-                "service": 2.0923264184900696,
-                "shops": 2.104153325681309,
+                "cbd": 8425.646184614923,
+                "population": 0.08459236023740989,
+                "service": 2.086820055467027,
+                "shops": 2.10321266786301,
                 "zone_area": 1.0
             },
             "attraction": {
@@ -318,16 +318,16 @@
         "transit": {
             "impedance": {
                 "cost": (-0.3, -0.3),
-                "time": -0.0234162793932
+                "time": -0.0230985254877
             },
             "log": {
                 "size": 1.0
             },
             "size": {
-                "cbd": 8568.994235814573,
-                "population": 0.08443759373342159,
-                "service": 2.0923264184900696,
-                "shops": 2.104153325681309,
+                "cbd": 8425.646184614923,
+                "population": 0.08459236023740989,
+                "service": 2.086820055467027,
+                "shops": 2.10321266786301,
                 "zone_area": 1.0
             },
             "attraction": {
@@ -336,16 +336,16 @@
         },
         "bike": {
             "impedance": {
-                "dist": -0.425923735841
+                "dist": -0.425649313128
             },
             "log": {
                 "size": 1.0
             },
             "size": {
-                "cbd": 8568.994235814573,
-                "population": 0.08443759373342159,
-                "service": 2.0923264184900696,
-                "shops": 2.104153325681309,
+                "cbd": 8425.646184614923,
+                "population": 0.08459236023740989,
+                "service": 2.086820055467027,
+                "shops": 2.10321266786301,
                 "zone_area": 1.0
             },
             "attraction": {
@@ -354,16 +354,16 @@
         },
         "walk": {
             "impedance": {
-                "dist": -1.42917432164
+                "dist": -1.42907622252
             },
             "log": {
                 "size": 1.0
             },
             "size": {
-                "cbd": 8568.994235814573,
-                "population": 0.08443759373342159,
-                "service": 2.0923264184900696,
-                "shops": 2.104153325681309,
+                "cbd": 8425.646184614923,
+                "population": 0.08459236023740989,
+                "service": 2.086820055467027,
+                "shops": 2.10321266786301,
                 "zone_area": 1.0
             },
             "attraction": {

diff --git a/Scripts/parameters/mode_choice.py b/Scripts/parameters/mode_choice.py
@@ -303,16 +303,16 @@
     },
     "ho": {
         "car": {
+            "generation": {
+                "car_density": (2.53292563068, 2.53292563068)
+            },
             "individual_dummy": {
-                "car_users": (0.6413489816686422, 0.6413489816686422)
+                "car_users": (0.531562108394307, 0.531562108394307)
             },
             "log": {
-                "logsum": 0.0393831243227
+                "logsum": 0.0253292563068
             },
             "constant": (0.0, 0.0),
-            "generation": {
-
-            },
             "attraction": {
 
             },
@@ -321,9 +321,9 @@
             }
         },
         "transit": {
-            "constant": (1.6790343509396168, 1.6790343509396168),
+            "constant": (1.7157771774356747, 1.7157771774356747),
             "log": {
-                "logsum": 0.0393831243227
+                "logsum": 0.0253292563068
             },
             "generation": {
 
@@ -339,9 +339,9 @@
             }
         },
         "bike": {
-            "constant": (1.2091039047295131, 1.2091039047295131),
+            "constant": (1.2507530478536328, 1.2507530478536328),
             "log": {
-                "logsum": 0.0393831243227
+                "logsum": 0.0253292563068
             },
             "generation": {
 
@@ -357,9 +357,9 @@
             }
         },
         "walk": {
-            "constant": (3.4221205590097843, 3.4221205590097843),
+            "constant": (3.4250946898633368, 3.4250946898633368),
             "log": {
-                "logsum": 0.0393831243227
+                "logsum": 0.0253292563068
             },
             "generation": {
 

diff --git a/Scripts/tests/integration/test_models.py b/Scripts/tests/integration/test_models.py
@@ -53,7 +53,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.16592713011306415)
+        self.assertAlmostEquals(model.mode_share[0]["car"], 0.1774141551967313)
 
         print("Model system test done")