working up through generate_beam_plans

LBNL-UCB-STI · Apr 24, 2024 · c424b69 · c424b69
1 parent 162e602
commit c424b69
Show file tree

Hide file tree

Showing 6 changed files with 398 additions and 127 deletions.
diff --git a/activitysim/examples/prototype_mtc/configs/annotate_households.csv b/activitysim/examples/prototype_mtc/configs/annotate_households.csv
@@ -30,4 +30,3 @@ family,family,households.HHT.isin(HHT_FAMILY)
 home_is_urban,home_is_urban,"reindex(land_use.area_type, households.home_zone_id) < setting('urban_threshold')"
 home_is_rural,home_is_rural,"reindex(land_use.area_type, households.home_zone_id) > setting('rural_threshold')"
 #,, default for work and school location logsums before auto_ownership model is run
-auto_ownership,auto_ownership,households.VEHICL
diff --git a/activitysim/examples/prototype_mtc/configs/annotate_landuse.csv b/activitysim/examples/prototype_mtc/configs/annotate_landuse.csv
@@ -1,7 +1,7 @@
 Description,Target,Expression
 #,, annotate landuse table after import
-household_density,household_density,land_use.TOTHH / (land_use.RESACRE + land_use.CIACRE)
-employment_density,employment_density,land_use.TOTEMP / (land_use.RESACRE + land_use.CIACRE)
+household_density,household_density,land_use.TOTHH / (land_use.TOTACRE)
+employment_density,employment_density,land_use.TOTEMP / (land_use.TOTACRE)
 density_index,density_index,(household_density *employment_density) / (household_density + employment_density).clip(lower=1)
 ,is_cbd,land_use.area_type == 1
 
diff --git a/activitysim/examples/prototype_mtc/configs/settings.yaml b/activitysim/examples/prototype_mtc/configs/settings.yaml
@@ -60,19 +60,15 @@ input_table_list:
     filename: land_use.csv
     index_col: zone_id
     rename_columns:
-      ZONE: zone_id  # person_id is the required index column
+      TAZ: zone_id  # person_id is the required index column
       COUNTY: county_id
     recode_columns:
       zone_id: zero-based
     keep_columns:
-      - DISTRICT
-      - SD
       - county_id
       - TOTHH
       - TOTPOP
       - TOTACRE
-      - RESACRE
-      - CIACRE
       - TOTEMP
       - AGE0519
       - RETEMPN
@@ -169,7 +165,7 @@ keep_mem_logs: True
 # multiprocessing controls
 multiprocess: True
 chunk_size: 10_000_000_000
-num_processes: 94
+num_processes: 2
 stagger: 0
 
 # trace household id; comment out or leave empty for no trace

diff --git a/activitysim/examples/prototype_mtc/configs/tour_mode_choice_coefficients.csv b/activitysim/examples/prototype_mtc/configs/tour_mode_choice_coefficients.csv
@@ -9,6 +9,7 @@ coef_nest_TRANSIT,0.72,T
 coef_nest_TRANSIT_WALKACCESS,0.5,T
 coef_nest_TRANSIT_DRIVEACCESS,0.5,T
 coef_nest_RIDEHAIL,0.36,T
+coef_one,1.0,F
 coef_ivt_eatout_escort_othdiscr_othmaint_shopping_social,-0.0175,F
 coef_ivt_school_univ,-0.0224,F
 coef_ivt_work,-0.0134,F

diff --git a/activitysim/examples/prototype_mtc/configs/trip_mode_choice_annotate_trips_preprocessor.csv b/activitysim/examples/prototype_mtc/configs/trip_mode_choice_annotate_trips_preprocessor.csv
@@ -3,7 +3,6 @@ Description,Target,Expression
 ,is_indiv,(df.number_of_participants == 1)
 ,is_atwork_subtour,~df.parent_tour_id.isnull()
 ,ivot,1.0 / df.value_of_time
-,c_cost,(0.60 * c_ivt) / df.value_of_time
 #,,
 #atwork subtours,,
 #FIXME tripModeChoice uec wrongly conflates these with tour_mode_is_bike?,,