diff --git a/resident/configs/atwork_subtour_destination.yaml b/resident/configs/atwork_subtour_destination.yaml index 232e1dc..bcbed3d 100644 --- a/resident/configs/atwork_subtour_destination.yaml +++ b/resident/configs/atwork_subtour_destination.yaml @@ -12,12 +12,6 @@ SEGMENTS: ORIG_ZONE_ID: workplace_zone_id -SIMULATE_CHOOSER_COLUMNS: - - person_id - - income_segment - - workplace_zone_id - - ptype - LOGSUM_SETTINGS: tour_mode_choice.yaml # model-specific logsum-related settings diff --git a/resident/configs/external_non_mandatory_destination.yaml b/resident/configs/external_non_mandatory_destination.yaml index 82af7ed..3d35e0a 100644 --- a/resident/configs/external_non_mandatory_destination.yaml +++ b/resident/configs/external_non_mandatory_destination.yaml @@ -23,17 +23,6 @@ SEGMENTS: - social - escort -SIMULATE_CHOOSER_COLUMNS: - - tour_type - - home_zone_id - - person_id - - female - - income - - income_segment - - age - - tour_type_count - - tour_type_num - LOGSUM_SETTINGS: tour_mode_choice.yaml # model-specific logsum-related settings diff --git a/resident/configs/external_workplace_location.yaml b/resident/configs/external_workplace_location.yaml index f106547..f009b8d 100644 --- a/resident/configs/external_workplace_location.yaml +++ b/resident/configs/external_workplace_location.yaml @@ -1,9 +1,5 @@ SAMPLE_SIZE: 30 -SIMULATE_CHOOSER_COLUMNS: - - home_zone_id - - household_id - # model-specific logsum-related settings CHOOSER_ORIG_COL_NAME: home_zone_id ALT_DEST_COL_NAME: alt_dest diff --git a/resident/configs/mandatory_tour_scheduling.yaml b/resident/configs/mandatory_tour_scheduling.yaml index 4063f07..359b2a9 100644 --- a/resident/configs/mandatory_tour_scheduling.yaml +++ b/resident/configs/mandatory_tour_scheduling.yaml @@ -1,27 +1,3 @@ - -SIMULATE_CHOOSER_COLUMNS: - - age - - female - - ptype - - is_income_less25K - - is_income_25K_to_60K - - is_income_60K_to_120K - - is_income_greater120K - - is_pre_drive_child_in_HH - - is_non_worker_in_HH - - auto_ownership - - is_all_adults_full_time_workers - - distance_to_school - - roundtrip_auto_time_to_work - - roundtrip_auto_time_to_school - - free_parking_at_work - - workplace_zone_id - - school_zone_id - - home_zone_id - - TAZ - - transit_pass_ownership - - transit_pass_subsidy - LOGSUM_SETTINGS: tour_mode_choice.yaml TOUR_SPEC_SEGMENTS: diff --git a/resident/configs/network_los.yaml b/resident/configs/network_los.yaml index fcd555b..3eeead8 100644 --- a/resident/configs/network_los.yaml +++ b/resident/configs/network_los.yaml @@ -46,9 +46,3 @@ skim_time_periods: # EV: 7 PM to midnight periods: [0, 6, 12, 24, 32, 42, 48] # time periods to match documentation labels: &skim_time_period_labels ['EA', 'AM', 'MD', 'PM', 'EV', 'EA'] - -demographic_segments: &demographic_segments - - &low_income_segment_id 0 - - &high_income_segment_id 1 - - diff --git a/resident/configs/non_mandatory_tour_destination.yaml b/resident/configs/non_mandatory_tour_destination.yaml index 6813065..6caf932 100644 --- a/resident/configs/non_mandatory_tour_destination.yaml +++ b/resident/configs/non_mandatory_tour_destination.yaml @@ -25,19 +25,6 @@ SEGMENTS: - social - escort -SIMULATE_CHOOSER_COLUMNS: - - tour_type - - home_zone_id - - person_id - - female - - income - - income_segment - - age - - tour_type_count - - tour_type_num - - tour_category - - LOGSUM_SETTINGS: tour_mode_choice.yaml # model-specific logsum-related settings diff --git a/resident/configs/non_mandatory_tour_scheduling.yaml b/resident/configs/non_mandatory_tour_scheduling.yaml index f18da06..b992f77 100644 --- a/resident/configs/non_mandatory_tour_scheduling.yaml +++ b/resident/configs/non_mandatory_tour_scheduling.yaml @@ -8,30 +8,6 @@ preprocessor: - joint_tour_participants - school_escort_tours -SIMULATE_CHOOSER_COLUMNS: - - home_zone_id - - age - - female - - adult - - ptype - - has_pre_school_child_with_mandatory - - has_driving_age_child_with_mandatory - - is_income_less25K - - is_income_25K_to_60K - - is_income_60K_to_120K - - auto_ownership - - num_children - - num_adults - - num_retired_adults - - hhsize - - num_mand - - num_joint_tours - - num_escort_tours - - num_non_escort_tours - - num_add_shop_maint_tours - - num_add_soc_discr_tours - - retired_adults_only_hh - LOGSUM_SETTINGS: tour_mode_choice.yaml # map : : diff --git a/resident/configs/school_escorting.yaml b/resident/configs/school_escorting.yaml index b038dee..5572eb3 100644 --- a/resident/configs/school_escorting.yaml +++ b/resident/configs/school_escorting.yaml @@ -40,12 +40,6 @@ preprocessor_outbound_cond: - persons - tours -SIMULATE_CHOOSER_COLUMNS: - - home_zone_id - - income - - auto_ownership - - num_workers - CONSTANTS: max_bin_difference_between_departure_times: 1 mins_per_time_bin: 30 diff --git a/resident/configs/school_location.yaml b/resident/configs/school_location.yaml index 6ff92cd..95842e9 100644 --- a/resident/configs/school_location.yaml +++ b/resident/configs/school_location.yaml @@ -1,15 +1,6 @@ SAMPLE_SIZE: 30 ESTIMATION_SAMPLE_SIZE: 30 -SIMULATE_CHOOSER_COLUMNS: - - home_zone_id - - school_segment - - household_id - - ptype - - COLLEGEENROLL - - income - - age - # model-specific logsum-related settings CHOOSER_ORIG_COL_NAME: home_zone_id ALT_DEST_COL_NAME: alt_dest diff --git a/resident/configs/tour_mode_choice.yaml b/resident/configs/tour_mode_choice.yaml index cc1d12d..084b785 100644 --- a/resident/configs/tour_mode_choice.yaml +++ b/resident/configs/tour_mode_choice.yaml @@ -69,29 +69,4 @@ annotate_tours: TABLES: - tours - -# to reduce memory needs filter chooser table to these fields -LOGSUM_CHOOSER_COLUMNS: - - tour_type - - hhsize - - density_index - - age - - SEX - - auto_ownership - - num_drivers - - num_adults - - ptype - - number_of_participants - - tour_category - - value_of_time - - free_parking_at_work - - income_segment - - income - - time_factor_work - - time_factor_nonwork - - num_escortees - - ebike_owner - - transit_pass_subsidy - - transit_pass_ownership - MODE_CHOICE_LOGSUM_COLUMN_NAME: mode_choice_logsum diff --git a/resident/configs/tour_scheduling_atwork.yaml b/resident/configs/tour_scheduling_atwork.yaml index f04f93b..d328515 100644 --- a/resident/configs/tour_scheduling_atwork.yaml +++ b/resident/configs/tour_scheduling_atwork.yaml @@ -8,9 +8,6 @@ preprocessor: # TABLES: # - land_use # - tours - -SIMULATE_CHOOSER_COLUMNS: - - od_distance CONSTANTS: time_cap: 30 \ No newline at end of file diff --git a/resident/configs/workplace_location.yaml b/resident/configs/workplace_location.yaml index 8e4e448..9c6c3bf 100644 --- a/resident/configs/workplace_location.yaml +++ b/resident/configs/workplace_location.yaml @@ -1,14 +1,6 @@ SAMPLE_SIZE: 30 ESTIMATION_SAMPLE_SIZE: 30 -SIMULATE_CHOOSER_COLUMNS: - - income_segment - - home_zone_id - - income - - age - - ptype - - female - SAMPLE_SPEC: workplace_location_sample.csv SPEC: workplace_location.csv COEFFICIENTS: workplace_location_coefficients.csv