From 4f15c238d8b9a712c6a5e48c5fd503dead45970c Mon Sep 17 00:00:00 2001 From: Vivek Yadav Date: Mon, 8 Apr 2024 13:03:53 -0400 Subject: [PATCH] Update the tour schedule university config file to work with sharrow Sharrow cannot handle shift function --- configs/resident/tour_scheduling_university.csv | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/resident/tour_scheduling_university.csv b/configs/resident/tour_scheduling_university.csv index 9617383..b7ae192 100644 --- a/configs/resident/tour_scheduling_university.csv +++ b/configs/resident/tour_scheduling_university.csv @@ -12,12 +12,12 @@ util_Distance_to_destination_Departure_after_830_am_Linear,UNIVERSITY - Distance util_Distance_to_destination_Durationlt_4_hrs_Linear,UNIVERSITY - Distance to destination - Duration< 4 hrs -Linear,"@((df.duration<8))*((np.minimum(8-df.duration,6)*(df.duration<=8)) + (np.minimum(df.duration-8,28)*(df.duration>8)))*(df.distance_to_school)",coef_Distance_to_destination_Durationlt_4_hrs_Linear util_Distance_to_destination_Durationgt_4_hrs_Linear,UNIVERSITY - Distance to destination - Duration> 4 hrs- Linear,"@((df.duration>8))*((np.minimum(8-df.duration,6)*(df.duration<=8)) + (np.minimum(df.duration-8,28)*(df.duration>8)))*(df.distance_to_school)",coef_Distance_to_destination_Durationgt_4_hrs_Linear util_Distance_to_destination_Durationlt_4_hrs_Square_Root,UNIVERSITY - Distance to destination - Duration< 4 hrs - Square Root,"@((df.duration<8))*(abs(((np.minimum(8-df.duration,6)*(df.duration<=8)) + (np.minimum(df.duration-8,28)*(df.duration>8)))) ** 0.5)*(df.distance_to_school)",coef_Distance_to_destination_Durationlt_4_hrs_Square_Root -util_Subsequent_tour_is_work_tour_Departure_after_830_am,UNIVERSITY - Subsequent tour is work tour: Departure after 8:30 am,"@(((df.tour_count>1) & (df.tour_num == 1) & (df.tour_type.shift(-1) == 'work') & (df.start>11)))*((np.minimum(11-df.start,8)*(df.start<=11)) + (np.minimum(df.start-11,22)*(df.start>11)))",coef_Subsequent_tour_is_work_tour_Departure_after_830_am -util_Subsequent_tour_is_work_tour_Duration_lt_4_hours,UNIVERSITY - Subsequent tour is work tour: Duration < 4 hours,"@(((df.tour_count>1) & (df.tour_num == 1) & (df.tour_type.shift(-1) == 'work') & (df.duration<8)))*((np.minimum(8-df.duration,6)*(df.duration<=8)) + (np.minimum(df.duration-8,28)*(df.duration>8)))",coef_Subsequent_tour_is_work_tour_Duration_lt_4_hours -util_Subsequent_tour_is_work_tour_Duration_gt_4_hours,UNIVERSITY - Subsequent tour is work tour: Duration > 4 hours,"@(((df.tour_count>1) & (df.tour_num == 1) & (df.tour_type.shift(-1) == 'work') & (df.duration>8)))*((np.minimum(8-df.duration,6)*(df.duration<=8)) + (np.minimum(df.duration-8,28)*(df.duration>8)))",coef_Subsequent_tour_is_work_tour_Duration_gt_4_hours -util_Subsequent_tour_is_school_tour_Departure_after_830_am,UNIVERSITY - Subsequent tour is school tour: Departure after 8:30 am,"@(((df.tour_count>1) & (df.tour_num == 1) & (df.tour_type.shift(-1) == 'school') & (df.start>11)))*((np.minimum(11-df.start,8)*(df.start<=11)) + (np.minimum(df.start-11,22)*(df.start>11)))",coef_Subsequent_tour_is_school_tour_Departure_after_830_am -util_Subsequent_tour_is_school_tour_Duration_lt_4_hours,UNIVERSITY - Subsequent tour is school tour: Duration < 4 hours,"@(((df.tour_count>1) & (df.tour_num == 1) & (df.tour_type.shift(-1) == 'school') & (df.duration<8)))*((np.minimum(8-df.duration,6)*(df.duration<=8)) + (np.minimum(df.duration-8,28)*(df.duration>8)))",coef_Subsequent_tour_is_school_tour_Duration_lt_4_hours -util_Subsequent_tour_is_school_tour_Duration_gt_4_hours,UNIVERSITY - Subsequent tour is school tour: Duration > 4 hours,"@(((df.tour_count>1) & (df.tour_num == 1) & (df.tour_type.shift(-1) == 'school') & (df.duration>8)))*((np.minimum(8-df.duration,6)*(df.duration<=8)) + (np.minimum(df.duration-8,28)*(df.duration>8)))",coef_Subsequent_tour_is_school_tour_Duration_gt_4_hours +util_Subsequent_tour_is_work_tour_Departure_after_830_am,UNIVERSITY - Subsequent tour is work tour: Departure after 8:30 am,"@(((df.tour_count>1) & (df.tour_num == 1) & (df.subsequent_tour_is_work) & (df.start>11)))*((np.minimum(11-df.start,8)*(df.start<=11)) + (np.minimum(df.start-11,22)*(df.start>11)))",coef_Subsequent_tour_is_work_tour_Departure_after_830_am +util_Subsequent_tour_is_work_tour_Duration_lt_4_hours,UNIVERSITY - Subsequent tour is work tour: Duration < 4 hours,"@(((df.tour_count>1) & (df.tour_num == 1) & (df.subsequent_tour_is_work) & (df.duration<8)))*((np.minimum(8-df.duration,6)*(df.duration<=8)) + (np.minimum(df.duration-8,28)*(df.duration>8)))",coef_Subsequent_tour_is_work_tour_Duration_lt_4_hours +util_Subsequent_tour_is_work_tour_Duration_gt_4_hours,UNIVERSITY - Subsequent tour is work tour: Duration > 4 hours,"@(((df.tour_count>1) & (df.tour_num == 1) & (df.subsequent_tour_is_work) & (df.duration>8)))*((np.minimum(8-df.duration,6)*(df.duration<=8)) + (np.minimum(df.duration-8,28)*(df.duration>8)))",coef_Subsequent_tour_is_work_tour_Duration_gt_4_hours +util_Subsequent_tour_is_school_tour_Departure_after_830_am,UNIVERSITY - Subsequent tour is school tour: Departure after 8:30 am,"@(((df.tour_count>1) & (df.tour_num == 1) & (df.subsequent_tour_is_school) & (df.start>11)))*((np.minimum(11-df.start,8)*(df.start<=11)) + (np.minimum(df.start-11,22)*(df.start>11)))",coef_Subsequent_tour_is_school_tour_Departure_after_830_am +util_Subsequent_tour_is_school_tour_Duration_lt_4_hours,UNIVERSITY - Subsequent tour is school tour: Duration < 4 hours,"@(((df.tour_count>1) & (df.tour_num == 1) & (df.subsequent_tour_is_school) & (df.duration<8)))*((np.minimum(8-df.duration,6)*(df.duration<=8)) + (np.minimum(df.duration-8,28)*(df.duration>8)))",coef_Subsequent_tour_is_school_tour_Duration_lt_4_hours +util_Subsequent_tour_is_school_tour_Duration_gt_4_hours,UNIVERSITY - Subsequent tour is school tour: Duration > 4 hours,"@(((df.tour_count>1) & (df.tour_num == 1) & (df.subsequent_tour_is_school) & (df.duration>8)))*((np.minimum(8-df.duration,6)*(df.duration<=8)) + (np.minimum(df.duration-8,28)*(df.duration>8)))",coef_Subsequent_tour_is_school_tour_Duration_gt_4_hours util_Second_tour_of_two_mandatory_tours_Duration_lt_4_hours,UNIVERSITY - Second tour of two mandatory tours: Duration < 4 hours,"@(((df.tour_count>1) & (df.tour_num > 1)) & (df.duration<8))*((np.minimum(8-df.duration,6)*(df.duration<=8)) + (np.minimum(df.duration-8,28)*(df.duration>8)))",coef_Second_tour_of_two_mandatory_tours_Duration_lt_4_hours util_Second_tour_of_two_mandatory_tours_Duration_gt_4_hours,UNIVERSITY - Second tour of two mandatory tours: Duration > 4 hours,"@(((df.tour_count>1) & (df.tour_num > 1)) & (df.duration>8))*((np.minimum(8-df.duration,6)*(df.duration<=8)) + (np.minimum(df.duration-8,28)*(df.duration>8)))",coef_Second_tour_of_two_mandatory_tours_Duration_gt_4_hours util_Departure_Constant_Shift_for_every_30_minutes_before_0700_am_Linear,UNIVERSITY - Departure Constant: Shift for every 30 minutes before 07:00 am - Linear,"@((df.start<9))*((np.minimum(9-df.start,6)*(df.start<9)) + (np.minimum(df.start-13,20)*(df.start>13)))",coef_Departure_Constant_Shift_for_every_30_minutes_before_0700_am_Linear