Skip to content

Commit

Permalink
vars hardcoded in the custom chooser functions
Browse files Browse the repository at this point in the history
  • Loading branch information
i-am-sijia committed Mar 18, 2024
1 parent 7488de7 commit fb4cadc
Show file tree
Hide file tree
Showing 18 changed files with 2,154 additions and 0 deletions.
6 changes: 6 additions & 0 deletions activitysim/core/simulate.py
Original file line number Diff line number Diff line change
Expand Up @@ -1536,6 +1536,12 @@ def _simple_simulate(
unique_variables_in_spec.add("in_period")
unique_variables_in_spec.add("trip_period")

if custom_chooser:
import inspect

custom_chooser_lines = inspect.getsource(custom_chooser)
unique_variables_in_spec.update(re.findall(pattern, custom_chooser_lines))

# keep only variables needed for spec
choosers = choosers[[c for c in choosers.columns if c in unique_variables_in_spec]]

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
table_name,column_name,dtype,checkpoint
land_use,zone_id,int64,input_checker
land_use,DISTRICT,int64,input_checker
land_use,SD,int64,input_checker
land_use,county_id,int64,input_checker
land_use,TOTHH,int64,input_checker
land_use,TOTPOP,int64,input_checker
land_use,TOTACRE,float64,input_checker
land_use,RESACRE,float64,input_checker
land_use,CIACRE,float64,input_checker
land_use,TOTEMP,int64,input_checker
land_use,AGE0519,int64,input_checker
land_use,RETEMPN,int64,input_checker
land_use,FPSEMPN,int64,input_checker
land_use,HEREMPN,int64,input_checker
land_use,OTHEMPN,int64,input_checker
land_use,AGREMPN,int64,input_checker
land_use,MWTEMPN,int64,input_checker
land_use,PRKCST,float64,input_checker
land_use,OPRKCST,float64,input_checker
land_use,area_type,int64,input_checker
land_use,HSENROLL,float64,input_checker
land_use,COLLFTE,float64,input_checker
land_use,COLLPTE,float64,input_checker
land_use,TOPOLOGY,int64,input_checker
land_use,TERMINAL,float64,input_checker
land_use,_original_zone_id,int64,input_checker
land_use,household_density,float64,initialize_proto_population
land_use,employment_density,float64,initialize_proto_population
land_use,density_index,float64,initialize_proto_population
land_use,is_cbd,bool,initialize_proto_population
land_use,TOTENR_univ,float64,initialize_proto_population
land_use,ext_work_share,float64,initialize_proto_population
land_use,RETEMPN_scaled,float64,initialize_proto_population
land_use,FPSEMPN_scaled,float64,initialize_proto_population
land_use,HEREMPN_scaled,float64,initialize_proto_population
land_use,OTHEMPN_scaled,float64,initialize_proto_population
land_use,AGREMPN_scaled,float64,initialize_proto_population
land_use,MWTEMPN_scaled,float64,initialize_proto_population
land_use,TOTEMP_scaled,float64,initialize_proto_population
accessibility,zone_id,int64,initialize_proto_population
accessibility,auPkRetail,float64,compute_accessibility
accessibility,auPkTotal,float64,compute_accessibility
accessibility,auOpRetail,float64,compute_accessibility
accessibility,auOpTotal,float64,compute_accessibility
accessibility,trPkRetail,float64,compute_accessibility
accessibility,trPkTotal,float64,compute_accessibility
accessibility,trOpRetail,float64,compute_accessibility
accessibility,trOpTotal,float64,compute_accessibility
accessibility,nmRetail,float64,compute_accessibility
accessibility,nmTotal,float64,compute_accessibility
households,household_id,int64,initialize_households
households,home_zone_id,int64,initialize_households
households,income,int64,initialize_households
households,hhsize,int64,initialize_households
households,HHT,int64,initialize_households
households,auto_ownership,int32,initialize_households
households,num_workers,int64,initialize_households
households,sample_rate,float64,initialize_households
households,income_in_thousands,float64,initialize_households
households,income_segment,int32,initialize_households
households,median_value_of_time,float64,initialize_households
households,hh_value_of_time,float64,initialize_households
households,num_non_workers,int64,initialize_households
households,num_drivers,int8,initialize_households
households,num_adults,int8,initialize_households
households,num_children,int8,initialize_households
households,num_young_children,int8,initialize_households
households,num_children_5_to_15,int8,initialize_households
households,num_children_16_to_17,int8,initialize_households
households,num_college_age,int8,initialize_households
households,num_young_adults,int8,initialize_households
households,non_family,bool,initialize_households
households,family,bool,initialize_households
households,home_is_urban,bool,initialize_households
households,home_is_rural,bool,initialize_households
households,hh_work_auto_savings_ratio,float32,workplace_location
households,num_under16_not_at_school,int8,cdap_simulate
households,num_travel_active,int8,cdap_simulate
households,num_travel_active_adults,int8,cdap_simulate
households,num_travel_active_preschoolers,int8,cdap_simulate
households,num_travel_active_children,int8,cdap_simulate
households,num_travel_active_non_preschoolers,int8,cdap_simulate
households,participates_in_jtf_model,bool,cdap_simulate
households,school_escorting_outbound,float64,school_escorting
households,school_escorting_inbound,float64,school_escorting
households,school_escorting_outbound_cond,float64,school_escorting
households,joint_tour_frequency,category,joint_tour_frequency
households,num_hh_joint_tours,int8,joint_tour_frequency
persons,person_id,int64,initialize_households
persons,household_id,int64,initialize_households
persons,age,int64,initialize_households
persons,PNUM,int64,initialize_households
persons,sex,int64,initialize_households
persons,pemploy,int64,initialize_households
persons,pstudent,int64,initialize_households
persons,ptype,int64,initialize_households
persons,age_16_to_19,bool,initialize_households
persons,age_16_p,bool,initialize_households
persons,adult,bool,initialize_households
persons,male,bool,initialize_households
persons,female,bool,initialize_households
persons,has_non_worker,bool,initialize_households
persons,has_retiree,bool,initialize_households
persons,has_preschool_kid,bool,initialize_households
persons,has_driving_kid,bool,initialize_households
persons,has_school_kid,bool,initialize_households
persons,has_full_time,bool,initialize_households
persons,has_part_time,bool,initialize_households
persons,has_university,bool,initialize_households
persons,student_is_employed,bool,initialize_households
persons,nonstudent_to_school,bool,initialize_households
persons,is_student,bool,initialize_households
persons,is_gradeschool,bool,initialize_households
persons,is_highschool,bool,initialize_households
persons,is_university,bool,initialize_households
persons,school_segment,int8,initialize_households
persons,is_worker,bool,initialize_households
persons,home_zone_id,int64,initialize_households
persons,value_of_time,float64,initialize_households
persons,school_zone_id,int32,school_location
persons,school_location_logsum,float64,school_location
persons,distance_to_school,float32,school_location
persons,roundtrip_auto_time_to_school,float32,school_location
persons,workplace_zone_id,int32,workplace_location
persons,workplace_location_logsum,float64,workplace_location
persons,distance_to_work,float32,workplace_location
persons,workplace_in_cbd,bool,workplace_location
persons,work_zone_area_type,float64,workplace_location
persons,roundtrip_auto_time_to_work,float32,workplace_location
persons,work_auto_savings,float32,workplace_location
persons,work_auto_savings_ratio,float32,workplace_location
persons,free_parking_at_work,bool,free_parking
persons,cdap_activity,category,cdap_simulate
persons,travel_active,bool,cdap_simulate
persons,under16_not_at_school,bool,cdap_simulate
persons,has_preschool_kid_at_home,bool,cdap_simulate
persons,has_school_kid_at_home,bool,cdap_simulate
persons,mandatory_tour_frequency,category,mandatory_tour_frequency
persons,work_and_school_and_worker,bool,mandatory_tour_frequency
persons,work_and_school_and_student,bool,mandatory_tour_frequency
persons,num_mand,int8,mandatory_tour_frequency
persons,num_work_tours,int8,mandatory_tour_frequency
persons,num_joint_tours,int8,joint_tour_participation
persons,non_mandatory_tour_frequency,int16,non_mandatory_tour_frequency
persons,num_non_mand,int8,non_mandatory_tour_frequency
persons,num_escort_tours,int8,non_mandatory_tour_frequency
persons,num_eatout_tours,int8,non_mandatory_tour_frequency
persons,num_shop_tours,int8,non_mandatory_tour_frequency
persons,num_maint_tours,int8,non_mandatory_tour_frequency
persons,num_discr_tours,int8,non_mandatory_tour_frequency
persons,num_social_tours,int8,non_mandatory_tour_frequency
persons,num_non_escort_tours,int8,non_mandatory_tour_frequency
tours,tour_id,int64,mandatory_tour_frequency
tours,person_id,int64,mandatory_tour_frequency
tours,tour_type,category,mandatory_tour_frequency
tours,tour_type_count,int8,mandatory_tour_frequency
tours,tour_type_num,int8,mandatory_tour_frequency
tours,tour_num,int8,mandatory_tour_frequency
tours,tour_count,int8,mandatory_tour_frequency
tours,tour_category,category,mandatory_tour_frequency
tours,number_of_participants,int64,mandatory_tour_frequency
tours,destination,float64,mandatory_tour_frequency
tours,origin,float64,mandatory_tour_frequency
tours,household_id,int64,mandatory_tour_frequency
tours,start,float64,mandatory_tour_scheduling
tours,end,float64,mandatory_tour_scheduling
tours,duration,float64,mandatory_tour_scheduling
tours,school_esc_outbound,category,school_escorting
tours,school_esc_inbound,category,school_escorting
tours,num_escortees,float64,school_escorting
tours,tdd,float64,mandatory_tour_scheduling
tours,composition,category,joint_tour_composition
tours,destination_logsum,float64,joint_tour_destination
tours,vehicle_occup_1,category,vehicle_allocation
tours,vehicle_occup_2,category,vehicle_allocation
tours,vehicle_occup_3.5,category,vehicle_allocation
tours,tour_mode,category,tour_mode_choice_simulate
tours,mode_choice_logsum,float64,tour_mode_choice_simulate
tours,selected_vehicle,object,tour_mode_choice_simulate
tours,atwork_subtour_frequency,category,atwork_subtour_frequency
tours,parent_tour_id,float64,atwork_subtour_frequency
tours,stop_frequency,object,stop_frequency
tours,primary_purpose,category,stop_frequency
trips,trip_id,int64,stop_frequency
trips,person_id,int64,stop_frequency
trips,household_id,int64,stop_frequency
trips,primary_purpose,category,stop_frequency
trips,trip_num,int64,stop_frequency
trips,outbound,bool,stop_frequency
trips,trip_count,int64,stop_frequency
trips,destination,int32,stop_frequency
trips,origin,int32,stop_frequency
trips,tour_id,int64,stop_frequency
trips,escort_participants,object,stop_frequency
trips,school_escort_direction,category,stop_frequency
trips,purpose,object,trip_purpose
trips,destination_logsum,float64,trip_destination
trips,depart,int32,trip_scheduling
trips,trip_mode,category,trip_mode_choice
trips,mode_choice_logsum,float64,trip_mode_choice
joint_tour_participants,participant_id,int64,joint_tour_participation
joint_tour_participants,tour_id,int64,joint_tour_participation
joint_tour_participants,household_id,int64,joint_tour_participation
joint_tour_participants,person_id,int64,joint_tour_participation
joint_tour_participants,participant_num,int64,joint_tour_participation
vehicles,vehicle_id,int64,vehicle_type_choice
vehicles,household_id,int64,vehicle_type_choice
vehicles,vehicle_num,int64,vehicle_type_choice
vehicles,vehicle_type,category,vehicle_type_choice
vehicles,auto_operating_cost,float64,vehicle_type_choice
vehicles,Range,int64,vehicle_type_choice
vehicles,MPG,float64,vehicle_type_choice
Loading

0 comments on commit fb4cadc

Please sign in to comment.