HBO model updated, much better rho

HSLdevcom · Sep 19, 2024 · 778e801 · 778e801
1 parent e17c9df
commit 778e801
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 35 deletions.
diff --git a/Scripts/parameters/destination_choice.py b/Scripts/parameters/destination_choice.py
@@ -298,17 +298,16 @@
     "ho": {
         "car": {
             "impedance": {
-                "time": (-0.02685, -0.02685),
-                "cost": (-0.3, -0.3)
+                "time": (-0.0379795754941, -0.0379795754941),
+                "cost": (-0.25, -0.25)
             },
             "log": {
                 "size": 1.0
             },
             "size": {
-                "cbd": 8425.646184614923,
-                "population": 0.08459236023740989,
-                "service": 2.086820055467027,
-                "shops": 2.10321266786301,
+                "population": 0.00045962843156057554,
+                "service": 0.0008589758116822679,
+                "shops": 0.008363140264013516,
                 "zone_area": 1.0
             },
             "attraction": {
@@ -317,35 +316,34 @@
         },
         "transit": {
             "impedance": {
-                "cost": (-0.3, -0.3),
-                "time": -0.0230985254877
+                "cost": (-0.25, -0.25),
+                "time": -0.0246860090883
+            },
+            "attraction": {
+                "cbd": 1.31608368465,
+                "own_zone": -4.17267736996
             },
             "log": {
                 "size": 1.0
             },
             "size": {
-                "cbd": 8425.646184614923,
-                "population": 0.08459236023740989,
-                "service": 2.086820055467027,
-                "shops": 2.10321266786301,
+                "population": 0.00045962843156057554,
+                "service": 0.0008589758116822679,
+                "shops": 0.008363140264013516,
                 "zone_area": 1.0
-            },
-            "attraction": {
-
             }
         },
         "bike": {
             "impedance": {
-                "dist": -0.425649313128
+                "dist": -0.334016396671
             },
             "log": {
                 "size": 1.0
             },
             "size": {
-                "cbd": 8425.646184614923,
-                "population": 0.08459236023740989,
-                "service": 2.086820055467027,
-                "shops": 2.10321266786301,
+                "population": 0.00045962843156057554,
+                "service": 0.0008589758116822679,
+                "shops": 0.008363140264013516,
                 "zone_area": 1.0
             },
             "attraction": {
@@ -354,16 +352,15 @@
         },
         "walk": {
             "impedance": {
-                "dist": -1.42907622252
+                "dist": -0.671037353087
             },
             "log": {
                 "size": 1.0
             },
             "size": {
-                "cbd": 8425.646184614923,
-                "population": 0.08459236023740989,
-                "service": 2.086820055467027,
-                "shops": 2.10321266786301,
+                "population": 0.00045962843156057554,
+                "service": 0.0008589758116822679,
+                "shops": 0.008363140264013516,
                 "zone_area": 1.0
             },
             "attraction": {

diff --git a/Scripts/parameters/mode_choice.py b/Scripts/parameters/mode_choice.py
@@ -304,13 +304,13 @@
     "ho": {
         "car": {
             "generation": {
-                "car_density": (2.53292563068, 2.53292563068)
+                "car_density": (3.3651356459092665, 3.3651356459092665)
             },
             "individual_dummy": {
-                "car_users": (0.531562108394307, 0.531562108394307)
+                "car_users": (1.1528306055637745, 1.1528306055637745)
             },
             "log": {
-                "logsum": 0.0253292563068
+                "logsum": 0.730784592403
             },
             "constant": (0.0, 0.0),
             "attraction": {
@@ -321,9 +321,9 @@
             }
         },
         "transit": {
-            "constant": (1.7157771774356747, 1.7157771774356747),
+            "constant": (2.2570356641975127, 2.2570356641975127),
             "log": {
-                "logsum": 0.0253292563068
+                "logsum": 0.730784592403
             },
             "generation": {
 
@@ -339,9 +339,9 @@
             }
         },
         "bike": {
-            "constant": (1.2507530478536328, 1.2507530478536328),
+            "constant": (1.7508561304377777, 1.7508561304377777),
             "log": {
-                "logsum": 0.0253292563068
+                "logsum": 0.730784592403
             },
             "generation": {
 
@@ -357,9 +357,9 @@
             }
         },
         "walk": {
-            "constant": (3.4250946898633368, 3.4250946898633368),
+            "constant": (3.61236282065541, 3.61236282065541),
             "log": {
-                "logsum": 0.0253292563068
+                "logsum": 0.730784592403
             },
             "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.1774141551967313)
+        self.assertAlmostEquals(model.mode_share[0]["car"], 0.20631463674273975)
 
         print("Model system test done")