Final Calibration Adjustments

model/configs/shadow_pricing.yaml

@@ -26,7 +26,7 @@ TARGET_THRESHOLD: 20
 # zone passes if modeled is within percent_tolerance of  predicted_size
 PERCENT_TOLERANCE: 5
 # max percentage of zones allowed to fail
-FAIL_THRESHOLD: 10
+FAIL_THRESHOLD: 1
 # apply different targets for each segment specified in destination_size_terms.csv
 school_segmentation_targets:
   # format is segment: land_use_column

model/configs/summarize.csv

@@ -91,6 +91,7 @@ Description,Output,Expression
 ,tours_by_tour_type_by_tour_mode_count,"tours_merged.groupby(['tour_type','tour_mode']).size().rename('tours').reset_index()"
 ,tours_by_tour_type_by_tour_mode_by_stops_count,"tours_merged.groupby(['tour_type','tour_mode','stop_frequency']).size().rename('tours').reset_index()"
 ,tours_by_tour_type_by_tod_count,"tours_merged.groupby(['tour_type','start']).size().rename('tours').reset_index()"
+,tours_by_tour_type_by_auto_sufficiency,"tours_merged.assign(auto_sufficiency=np.where(tours_merged['auto_ownership'] == 0, 'zero_auto_households', np.where(tours_merged['auto_ownership'] < tours_merged['num_workers'], 'autos_lt_workers', 'autos_ge_workers'))).groupby(['tour_type', 'auto_sufficiency']).size().rename('tours').reset_index()"
 
 # Count work tours by time of day
 ,_work_tours,trips_merged[trips_merged['tour_type'] == 'work']

model/configs/tour_mode_choice_coefficients.csv

@@ -41,16 +41,16 @@ walk_ASC_auto_deficient_social,2.870184,F
 walk_ASC_auto_deficient_univ,4.50591,F
 walk_ASC_auto_deficient_work,2.4010417,F
 walk_ASC_auto_deficient_atwork,0.92546093,F
-walk_ASC_auto_sufficient_eatout,1.05,F
-walk_ASC_auto_sufficient_escort,-1.31,F
-walk_ASC_auto_sufficient_othdiscr,0.77,F
-walk_ASC_auto_sufficient_othmaint,0.3,F
-walk_ASC_auto_sufficient_school,0.15,F
-walk_ASC_auto_sufficient_shopping,0.23,F
-walk_ASC_auto_sufficient_social,1.21,F
-walk_ASC_auto_sufficient_univ,0.56,F
-walk_ASC_auto_sufficient_work,-0.44,F
-walk_ASC_auto_sufficient_atwork,0.18,F
+walk_ASC_auto_sufficient_eatout,-0.24,F
+walk_ASC_auto_sufficient_escort,-2.6,F
+walk_ASC_auto_sufficient_othdiscr,-0.53,F
+walk_ASC_auto_sufficient_othmaint,-0.99,F
+walk_ASC_auto_sufficient_school,-1.14,F
+walk_ASC_auto_sufficient_shopping,-1.06,F
+walk_ASC_auto_sufficient_social,-0.09,F
+walk_ASC_auto_sufficient_univ,-0.73,F
+walk_ASC_auto_sufficient_work,-1.74,F
+walk_ASC_auto_sufficient_atwork,-1.12,F
 bike_ASC_no_auto_eatout,0.86807096,F
 bike_ASC_no_auto_escort,-0.716212,F
 bike_ASC_no_auto_othdiscr,-0.3764232,F

model/configs_mp/settings.yaml

@@ -69,7 +69,7 @@ models:
   - write_data_dictionary
   - write_trip_matrices
   - write_tables
-  # - summarize # needed only for SimWrapper Viz
+  - summarize # needed only for SimWrapper Viz
 
 
 # Restart workers after the tour phase. This releases process-local heaps before

tests/baselines/10000.json

@@ -3,57 +3,57 @@
     "households": 10000,
     "persons": 23378,
     "tours": 28067,
-    "trips": 70788
+    "trips": 71003
   },
   "persons.cdap_activity": {
     "": 0.0,
-    "M": 0.4579091453503294,
-    "N": 0.3499443921635726,
+    "M": 0.4578663700915391,
+    "N": 0.3499871674223629,
     "H": 0.19214646248609804
   },
   "households.auto_ownership": {
-    "0": 0.2577,
-    "1": 0.408,
+    "0": 0.2575,
+    "1": 0.4082,
     "2": 0.2498,
-    "3": 0.0561,
-    "4": 0.0284
+    "3": 0.056,
+    "4": 0.0285
   },
   "tours.tour_type": {
     "atwork": 0.0,
-    "business": 0.009762354366337692,
-    "eat": 0.052018384579755585,
-    "eatout": 0.060640609969002744,
-    "escort": 0.0790251897245876,
+    "business": 0.009797983396871771,
+    "eat": 0.0521609007018919,
+    "eatout": 0.060533722877400505,
+    "escort": 0.07898956069405351,
     "home": 0.0,
-    "maint": 0.007767128656429259,
-    "othdiscr": 0.11985605871664232,
-    "othmaint": 0.07898956069405351,
-    "school": 0.13660170306765954,
-    "shopping": 0.1558057505255282,
-    "social": 0.03616346599209035,
+    "maint": 0.007909644778565575,
+    "othdiscr": 0.119713542594506,
+    "othmaint": 0.07877578651084904,
+    "school": 0.13677984822032993,
+    "shopping": 0.15609078276980085,
+    "social": 0.03594969180888588,
     "univ": 0.0,
-    "work": 0.2633697937079132
+    "work": 0.263298535646845
   },
   "tours.tour_mode": {
     "": 0.0,
-    "BIKE": 0.09431004382370756,
-    "DRIVEALONE": 0.3083336302419211,
-    "DRIVE_TRANSIT": 0.00299283856486265,
-    "RIDESOURCE": 0.05682830370185627,
-    "SHARED2": 0.1691666369758079,
-    "SHARED3": 0.1468984928920084,
-    "WALK": 0.13660170306765954,
-    "WALK_TRANSIT": 0.08486835073217658
+    "BIKE": 0.09947625325114903,
+    "DRIVEALONE": 0.31570883956247553,
+    "DRIVE_TRANSIT": 0.0030284675953967293,
+    "RIDESOURCE": 0.057220223037731145,
+    "SHARED2": 0.17711191078490754,
+    "SHARED3": 0.15790786332703888,
+    "WALK": 0.10200591441906866,
+    "WALK_TRANSIT": 0.08754052802223251
   },
   "trips.trip_mode": {
     "": 0.0,
-    "DRIVEALONE": 0.3909560942532633,
-    "SHARED2": 0.1410973611346556,
-    "SHARED3": 0.09658416680793355,
-    "WALK": 0.16450528338136408,
-    "BIKE": 0.08641295134768605,
-    "WALK_TRANSIT": 0.06301915578911679,
-    "DRIVE_TRANSIT": 0.002373283607391083,
-    "RIDESOURCE": 0.055051703678589595
+    "DRIVEALONE": 0.39894088982155684,
+    "SHARED2": 0.14776840415193723,
+    "SHARED3": 0.10178443164373337,
+    "WALK": 0.13954339957466586,
+    "BIKE": 0.09020745602298494,
+    "WALK_TRANSIT": 0.06419447065616946,
+    "DRIVE_TRANSIT": 0.0023942650310550258,
+    "RIDESOURCE": 0.055166683097897275
   }
 }

tests/baselines/2000.json

@@ -3,57 +3,57 @@
     "households": 2000,
     "persons": 4751,
     "tours": 5751,
-    "trips": 14346
+    "trips": 14401
   },
   "persons.cdap_activity": {
     "": 0.0,
-    "M": 0.469795832456325,
+    "M": 0.47000631446011365,
     "N": 0.3384550620921911,
-    "H": 0.1917491054514839
+    "H": 0.19153862344769523
   },
   "households.auto_ownership": {
     "0": 0.264,
-    "1": 0.3985,
+    "1": 0.399,
     "2": 0.25,
-    "3": 0.0565,
+    "3": 0.056,
     "4": 0.031
   },
   "tours.tour_type": {
     "atwork": 0.0,
-    "business": 0.010259085376456268,
-    "eat": 0.05268648930620762,
-    "eatout": 0.06294557468266389,
+    "business": 0.01078073378542862,
+    "eat": 0.05216484089723526,
+    "eatout": 0.06225004347070075,
     "escort": 0.0759867849069727,
     "home": 0.0,
-    "maint": 0.009215788558511562,
+    "maint": 0.009041905755520779,
     "othdiscr": 0.11945748565466875,
-    "othmaint": 0.07250912884715702,
-    "school": 0.13458528951486698,
-    "shopping": 0.15162580420796384,
+    "othmaint": 0.07355242566510173,
+    "school": 0.13475917231785775,
+    "shopping": 0.1509302729960007,
     "social": 0.03686315423404625,
     "univ": 0.0,
-    "work": 0.27386541471048514
+    "work": 0.2742131803164667
   },
   "tours.tour_mode": {
     "": 0.0,
-    "BIKE": 0.09615719005390366,
-    "DRIVEALONE": 0.3063814988697618,
-    "DRIVE_TRANSIT": 0.0038254216657972527,
-    "RIDESOURCE": 0.05233872370022605,
-    "SHARED2": 0.16953573291601462,
-    "SHARED3": 0.14397496087636932,
-    "WALK": 0.1411928360285168,
-    "WALK_TRANSIT": 0.08659363588941053
+    "BIKE": 0.10172143974960876,
+    "DRIVEALONE": 0.3173361154581812,
+    "DRIVE_TRANSIT": 0.0036515388628064684,
+    "RIDESOURCE": 0.05251260650321683,
+    "SHARED2": 0.17666492783863677,
+    "SHARED3": 0.15597287428273343,
+    "WALK": 0.10502521300643367,
+    "WALK_TRANSIT": 0.08711528429838289
   },
   "trips.trip_mode": {
     "": 0.0,
-    "DRIVEALONE": 0.3913285933361216,
-    "SHARED2": 0.13899344765091315,
-    "SHARED3": 0.09800641293740416,
-    "WALK": 0.16889725358985083,
-    "BIKE": 0.08859612435522096,
-    "WALK_TRANSIT": 0.061689669594312005,
-    "DRIVE_TRANSIT": 0.003067057019378224,
-    "RIDESOURCE": 0.04942144151679911
+    "DRIVEALONE": 0.4008749392403305,
+    "SHARED2": 0.1454065689882647,
+    "SHARED3": 0.10297895979445872,
+    "WALK": 0.14242066523158114,
+    "BIKE": 0.09332685230192347,
+    "WALK_TRANSIT": 0.0621484619123672,
+    "DRIVE_TRANSIT": 0.0029164641344351086,
+    "RIDESOURCE": 0.049927088396639126
   }
 }