Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated tour scheduling configs #30

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Description,Target,Expression,,,,,,
,departureLinearShift1,"np.minimum(9-alt_tdd.start,48)*(alt_tdd.start<=9) + np.minimum(alt_tdd.start-9,21)*(alt_tdd.start>9)"
,arrivalLinearShift1,"np.minimum(30-df.end,48)*(df.end<=30) + np.minimum(df.end-30,21)*(df.end>30)"
Description,Target,Expression
departure_shift,departureLinearShift1,"np.minimum(9-df.start,48)*(df.start<=9) + np.minimum(df.start-9,21)*(df.start>9)"
arrival_shift,arrivalLinearShift1,"np.minimum(30-df.end,48)*(df.end<=30) + np.minimum(df.end-30,21)*(df.end>30)"
duration_shift,durationShift,"(np.minimum(21-df.duration,47)*(df.duration<=20)) + (np.minimum(df.duration-21,20)*(df.duration>21))"
3 changes: 2 additions & 1 deletion configs/non_mandatory_tour_scheduling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ preprocessor:
TABLES:
- land_use
- joint_tour_participants



SIMULATE_CHOOSER_COLUMNS:

- age
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ Description,Target,Expression
#,,
number of person joint tours,num_person_joint_tours,"reindex_i(joint_tour_participants.groupby('person_id').size(), non_mandatory_tours.person_id)"
#,,
,origin_to_destination_distance,"skim_dict.lookup(non_mandatory_tours.origin, non_mandatory_tours.destination, ('SOV_FREE_DISTANCE', 'MD'))"
#,,
,origin_to_destination_distance,"skim_dict.lookup(non_mandatory_tours.origin, non_mandatory_tours.destination, ('SOV_FREE_DISTANCE', 'MD'))"
100 changes: 50 additions & 50 deletions configs/tour_scheduling_atwork.csv

Large diffs are not rendered by default.

46 changes: 46 additions & 0 deletions configs/tour_scheduling_atwork_coeffs.csv
Original file line number Diff line number Diff line change
@@ -1 +1,47 @@
coefficient_name,value,constrain
coef_Female_Departure_after_1230_pm_Linear,0.05574558,F
coef_Parttime_worker_Departure_after_1230_pm__Linear,0.129291333,F
coef_Parttime_worker_Duration_greater_than_0p5_hours_depart_and_arrive_in_the_same_period,0.162008704,F
coef_Low_income_lt25000_Duration_less_than_0p5_hours_depart_and_arrive_in_the_same_period,0.885322446,F
coef_Med_income_25k_to_60k_Duration_less_than_0p5_hours_depart_and_arrive_in_the_same_period,0.526935246,F
coef_Med_income_25k_to_60k_Duration_greater_than_0p5_hours,-0.081917021,F
coef_Medhigh_income_60k_to_120k_Duration_greater_than_0p5_hours,-0.068358924,F
coef_Blue_collar_Duration_less_than_0p5_hours_depart_and_arrive_in_the_same_period,1.191378628,F
coef_Blue_collar_Duration_greater_than_0p5_hours,0.123072852,F
coef_Health_Duration_less_than_0p5_hours_depart_and_arrive_in_the_same_period,0.791205377,F
coef_Distance_to_destination_Duration_less_than_0p5_hours_depart_and_arrive_in_the_same_period,-0.292363361,F
coef_Distance_to_destination_Duration_greater_than_0p5_hours,0.006885922,F
coef_Subtour_purpose_Business_Departure_before_1200_pm__Linear,0.268963895,F
coef_Subtour_purpose_Business_Departure_after_1230_pm_Linear,0.17631122,F
coef_Subtour_purpose_Business_Duration_greater_than_0p5_hours,0.362189199,F
coef_Subtour_purpose_Eatout_Departure_before_1200_pm__Linear,-0.250770206,F
coef_Subtour_purpose_Eatout_Departure_after_1230_pm_Linear,-0.169861029,F
coef_Subtour_purpose_Eatout_Duration_less_than_0p5_hours_depart_and_arrive_in_the_same_period,-0.678939929,F
coef_Shift_for_every_30_minutes_before_1030_am_Linear,-0.731880037,F
coef_Before_1100_AM,-2.176744062,F
coef_1100_AM_1130_AM,-1.190017952,F
coef_1130_AM_1200_PM,-0.198229872,F
coef_1200_AM_1230_PM,0,T
coef_1230_PM_0100_PM,-0.084950396,F
coef_After_0100_PM,-0.205562723,F
coef_Shift_for_every_30_minutes_after_130_pm_Square_Root,0.539088697,F
coef_Shift_for_every_30_minutes_before_1130_am_Linear,0.414546555,F
coef_Before_1200_PM,0.279351638,F
coef_1200_AM_1230_PM,-0.045281832,F
coef_1230_PM_0100_PM,0.214070736,F
coef_0100_PM_0130_PM,0,T
coef_0130_PM_0200_PM,-0.69742748,F
coef_0200_PM_0230_PM,-1.284283533,F
coef_After_0230_PM,-2.119733896,F
coef_Shift_for_every_30_minutes_after_300_pm_Linear,-0.508006414,F
coef_0_hrs,-0.969734874,F
coef_0p5_hrs,0,T
coef_1_hrs,0.177457256,F
coef_1p5hrs,-0.171124657,F
coef_2_hrs,-0.4678094,F
coef_Longer_than_2_hrs,-0.523935526,F
coef_Shift_for_every_30_minutes_more_than_2p5_hrs_Square_Root,-0.424301372,F
coef_Calibration_Constant_Departure_eq_18,-0.045958531,F
coef_Calibration_Constant_Departure_eq_19,-0.099009925,F
coef_Calibration_Constant_Arrival_eq_20,-0.0698094,F
coef_Calibration_Constant_Arrival_eq_21,-0.064355276,F
2 changes: 1 addition & 1 deletion configs/tour_scheduling_atwork_preprocessor.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Description,Target,Expression
#,,
local scalar distance skim,od_distance,"od_skims[('SOV_FREE_DISTANCE', 'MD')]"
local scalar distance skim,od_distance,"od_skims[('SOV_FREE_DISTANCE', 'MD')]"
736 changes: 315 additions & 421 deletions configs/tour_scheduling_joint.csv

Large diffs are not rendered by default.

399 changes: 399 additions & 0 deletions configs/tour_scheduling_joint_coeffs.csv

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions configs/tour_scheduling_nonmandatory.csv

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions configs/tour_scheduling_nonmandatory_coeffs.csv
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
coefficient_name,value,constrain
coef_escort_mode_choice_logsum,1.173173034,F
#Note,,F
coef_escort_distance_to_destination_duration_less_than_30_minutes,-0.335017673,F
coef_escort_distance_to_destination_duration_greater_than_30_minutes,0.005298165,F
coef_escort_fulltime_worker_departure_after_8_am_linear,-0.037980109,F
#Note,,F
coef_escort_fulltime_worker_departure_after_3_am_linear,0.163254125,F
coef_escort_fulltime_worker_duration_less_than_30_minutes,-0.275077482,F
coef_escort_fulltime_worker_duration_greater_than_30_minutes,0.051530545,F
coef_escort_university_student_duration_less_than_30_minutes,-0.426802718,F
coef_escort_non_driving_age_student_duration_greater_than_30_minutes,0.240582361,F
coef_escort_driving_age_student_duration_less_than_30_minutes,-0.554146191,F
coef_escort_driving_age_student_duration_greater_than_30_minutes,0.299387708,F
#Note,,F
coef_escort_pre_school_kid_duration_greater_than_30_minutes,0.195482563,F
coef_escort_med_high_income_duration_greater_than_30_minutes,-0.029281467,F
coef_escort_households_with_no_kids_departure_before_7_30_am,0.589083327,F
Expand Down Expand Up @@ -73,7 +70,6 @@ coef_escort_calibration_constant_departure_9,0.106814756,F
coef_escort_calibration_constant_departure_10,0.215386864,F
coef_escort_calibration_constant_departure_23,-0.255087318,F
coef_escort_calibration_constant_departure_24,-0.296870428,F
#SHOPPING,,F
coef_shoppping_driving_age_student_duration_greater_than_1_hour_30_minutes,0.122149101,F
coef_shoppping_full_time_worker_duration_greater_than_1_hour_30_minutes,-0.037886459,F
coef_shoppping_non_driving_student_duration_greater_than_1_hour_30_minutes,0.10247157,F
Expand Down Expand Up @@ -126,7 +122,6 @@ coef_shopping_duration_constant_duration_greater_than_2_hr_30_minutes_square_roo
coef_shopping_calibration_constant_duration_1,-0.138450424,F
coef_shopping_calibration_constant_duration_2,-0.092704403,F
coef_shopping_calibration_constant_duration_3,-0.087738073,F
#MAINTENANCE,0,T
coef_maintenance_driving_age_student_duration_greater_than_1_hour_30_minutes,0.122149101,F
coef_maintenance_full_time_worker_duration_greater_than_1_hour_30_minutes,-0.037886459,F
coef_maintenance_non_driving_student_duration_greater_than_1_hour_30_minutes,0.10247157,F
Expand Down Expand Up @@ -179,7 +174,6 @@ coef_maintenance_calibration_constant_duration_2,-0.103637715,F
coef_maintenance_calibration_constant_duration_3,-0.225442145,F
coef_maintenance_calibration_constant_duration_4,-0.145273012,F
coef_maintenance_calibration_constant_duration_5,-0.019241539,F
#EAT-OUT,,F
coef_eatout_distance_to_destination_duration_less_than_1_hr,-0.134981987,F
coef_eatout_distance_to_destination_duration_greater_than_1_hr,0.017860742,F
coef_eatout_low_income_duration_less_than_1_hr,1.002485807,F
Expand Down Expand Up @@ -238,7 +232,6 @@ coef_eatout_calibration_constant_departure_18,0.634353544,F
coef_eatout_calibration_constant_departure_19,0.584387268,F
coef_eatout_calibration_constant_departure_20,0.469777884,F
coef_eatout_calibration_constant_departure_21,0.39548931,F
#SOCIAL,,F
coef_social_person_less_than_18_years_old_duration_less_than_1_hr_30_minutes_linear,-0.262839914,F
coef_social_person_less_than_18_years_old_duration_greater_than_1_hr_30_minutes_linear,0.086919429,F
coef_social_non_working_senior_or_retiree_duration_less_than_1_hr_30_minutes_linear,0.468354376,F
Expand All @@ -247,7 +240,6 @@ coef_social_zero_auto_households_duration_less_than_1_hr_30_minutes_linear,-0.50
coef_social_zero_auto_households_duration_greater_than_1_hr_30_minutes_linear,0.074190914,F
coef_social_number_of_auto_more_than_number_of_adults_duration_less_than_1_hr_30_minutes_linear,0.127185965,F
coef_social_number_of_auto_more_than_number_of_adults_duration_greater_than_1_hr_30_minutes_linear,0.048756122,F
#Note,,F
coef_social_auto_distance_duration_less_than_1_hr_linear,-0.162965435,F
coef_social_auto_distance_duration_greater_than_1_hr_linear,0.006797399,F
coef_social_time_pressure_duration_less_than_1_hr,-0.229264474,F
Expand Down Expand Up @@ -291,7 +283,6 @@ coef_social_calibration_constant_duration_6,-0.03704707,F
coef_social_calibration_constant_duration_7,-0.062437167,F
coef_social_calibration_constant_duration_8,0.047640282,F
coef_social_calibration_constant_duration_9,0.284369793,F
#DISCRETIONARY,,F
coef_discretionary_person_less_than_18_years_old_duration_less_than_1_hr_30_minutes_linear,-0.262839914,F
coef_discretionary_person_less_than_18_years_old_duration_greater_than_1_hr_30_minutes_linear,0.086919429,F
coef_discretionary_non_working_senior_retiree_duration_less_than_1_hr_30_minutes_linear,0.468354376,F
Expand All @@ -300,7 +291,6 @@ coef_discretionary_zero_auto_households_duration_less_than_1_hr_30_minutes_linea
coef_discretionary_zero_auto_households_duration_greater_than_1_hr_30_minutes_linear,0.074190914,F
coef_discretionary_number_of_auto_more_than_number_of_adults_duration_less_than_1_hr_30_minutes_linear,0.127185965,F
coef_discretionary_number_of_auto_more_than_number_of_adults_duration_greater_than_1_hr_30_minutes_linear,0.048756122,F
#Note,,F
coef_discretionary_auto_distance_duration_less_than_1_hr_linear,-0.162965435,F
coef_discretionary_auto_distance_duration_greater_than_1_hr_linear,0.006797399,F
coef_discretionary_time_pressure_duration_less_than_1_hr,-0.229264474,F
Expand Down
Loading