ho model corrected, car_user dummy adjusted for Dcoeff

HSLdevcom · Sep 12, 2024 · 8678c15 · 8678c15
1 parent 2e864f3
commit 8678c15
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 28 deletions.
diff --git a/Scripts/parameters/destination_choice.py b/Scripts/parameters/destination_choice.py
@@ -298,16 +298,17 @@
     "ho": {
         "car": {
             "impedance": {
-                "time": (0.000895, 0.000895),
-                "cost": (0.01, 0.01)
+                "time": (-0.02685, -0.02685),
+                "cost": (-0.3, -0.3)
             },
             "log": {
                 "size": 1.0
             },
             "size": {
-                "population": 1.0,
-                "service": 20.085536923187668,
-                "shops": 7.38905609893065,
+                "cbd": 8568.994235814573,
+                "population": 0.08443759373342159,
+                "service": 2.0923264184900696,
+                "shops": 2.104153325681309,
                 "zone_area": 1.0
             },
             "attraction": {
@@ -316,16 +317,17 @@
         },
         "transit": {
             "impedance": {
-                "cost": (0.01, 0.01),
-                "time": -0.024812532636
+                "cost": (-0.3, -0.3),
+                "time": -0.0234162793932
             },
             "log": {
                 "size": 1.0
             },
             "size": {
-                "population": 1.0,
-                "service": 20.085536923187668,
-                "shops": 7.38905609893065,
+                "cbd": 8568.994235814573,
+                "population": 0.08443759373342159,
+                "service": 2.0923264184900696,
+                "shops": 2.104153325681309,
                 "zone_area": 1.0
             },
             "attraction": {
@@ -334,15 +336,16 @@
         },
         "bike": {
             "impedance": {
-                "dist": -0.390121359793
+                "dist": -0.425923735841
             },
             "log": {
                 "size": 1.0
             },
             "size": {
-                "population": 1.0,
-                "service": 20.085536923187668,
-                "shops": 7.38905609893065,
+                "cbd": 8568.994235814573,
+                "population": 0.08443759373342159,
+                "service": 2.0923264184900696,
+                "shops": 2.104153325681309,
                 "zone_area": 1.0
             },
             "attraction": {
@@ -351,15 +354,16 @@
         },
         "walk": {
             "impedance": {
-                "dist": -1.32830205317
+                "dist": -1.42917432164
             },
             "log": {
                 "size": 1.0
             },
             "size": {
-                "population": 1.0,
-                "service": 20.085536923187668,
-                "shops": 7.38905609893065,
+                "cbd": 8568.994235814573,
+                "population": 0.08443759373342159,
+                "service": 2.0923264184900696,
+                "shops": 2.104153325681309,
                 "zone_area": 1.0
             },
             "attraction": {

diff --git a/Scripts/parameters/mode_choice.py b/Scripts/parameters/mode_choice.py
@@ -11,7 +11,7 @@
                 "car_density": (1.2250392848606657, 1.2250392848606657)
             },
             "individual_dummy": {
-                "car_users": (4.00815837105, 4.00815837105)
+                "car_users": (3.615062091747702, 3.615062091747702)
             },
             "log": {
                 "logsum": 0.901925961274
@@ -233,7 +233,7 @@
                 "car_density": (6.063347609656314, 6.063347609656314)
             },
             "individual_dummy": {
-                "car_users": (3.31407023257, 3.31407023257)
+                "car_users": (1.846596191313385, 1.846596191313385)
             },
             "log": {
                 "logsum": 0.557198870792
@@ -304,10 +304,10 @@
     "ho": {
         "car": {
             "individual_dummy": {
-                "car_users": (19.8846209005, 19.8846209005)
+                "car_users": (0.6413489816686422, 0.6413489816686422)
             },
             "log": {
-                "logsum": 0.0331041833915
+                "logsum": 0.0393831243227
             },
             "constant": (0.0, 0.0),
             "generation": {
@@ -321,9 +321,9 @@
             }
         },
         "transit": {
-            "constant": (1.3034795000580932, 1.3034795000580932),
+            "constant": (1.6790343509396168, 1.6790343509396168),
             "log": {
-                "logsum": 0.0331041833915
+                "logsum": 0.0393831243227
             },
             "generation": {
 
@@ -339,9 +339,9 @@
             }
         },
         "bike": {
-            "constant": (0.8629432015400033, 0.8629432015400033),
+            "constant": (1.2091039047295131, 1.2091039047295131),
             "log": {
-                "logsum": 0.0331041833915
+                "logsum": 0.0393831243227
             },
             "generation": {
 
@@ -357,9 +357,9 @@
             }
         },
         "walk": {
-            "constant": (3.054667882518675, 3.054667882518675),
+            "constant": (3.4221205590097843, 3.4221205590097843),
             "log": {
-                "logsum": 0.0331041833915
+                "logsum": 0.0393831243227
             },
             "generation": {