Skip to content

Commit

Permalink
Fixes column mismatch in trip_mode_choice.csv
Browse files Browse the repository at this point in the history
  • Loading branch information
@tedlini
tedlini committed Mar 7, 2023
1 parent acfd320 commit a7d0f20
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions configs_dev/trip_mode_choice.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,21 +92,21 @@ util_WALK_FRY_Topology,WALK_FRY - Topology,@df.trip_topology,,,,,,,,coef_topolog
util_WALK_FRY_Person_is_less_than_10_years_old,WALK_FRY - Person is less than 10 years old,@(df.age <= 10),,,,,,,,coef_age010_trn,,,,,
#,Walk to Commuter rail,,,,,,,,,,,,,,
util_WALK_COM_Unavailable,WALK_COM - Unavailable,walk_commuter_available == False,,,,,,,,,-999,,,,
util_WALK_COM_In_vehicle_time_not_on_commuter_rail,WALK_COM - In-vehicle time not on commuter rail,@(odt_skims['WLK_COM_WLK_TOTIVT'] - odt_skims['WLK_COM_WLK_KEYIVT']) * df.time_factor,,,,,,,coef_ivt,,,,,,
util_WALK_COM_In_vehicle_time_on_commuter_rail,WALK_COM - In-vehicle time on commuter rail (incremental w/ ivt),@odt_skims['WLK_COM_WLK_KEYIVT'] * df.time_factor,,,,,,,coef_ivt_com,,,,,,
util_WALK_COM_Short_iwait_time,WALK_COM - Short iwait time,@(odt_skims['WLK_COM_WLK_IWAIT']).clip(upper=waitThresh) * df.time_factor,,,,,,,coef_iwait_short,,,,,,
util_WALK_COM_Long_iwait_time,WALK_COM - Long iwait time,@(odt_skims['WLK_COM_WLK_IWAIT']-waitThresh).clip(0) * df.time_factor,,,,,,,coef_iwait_long,,,,,,
util_WALK_COM_Short_transfer_wait_time,WALK_COM - Short transfer wait time,@(odt_skims['WLK_COM_WLK_XWAIT']).clip(upper=waitThresh) * df.time_factor,,,,,,,coef_xwait_short,,,,,,
util_WALK_COM_Long_transfer_wait_time,WALK_COM - Long transfer wait time,@(odt_skims['WLK_COM_WLK_XWAIT']-waitThresh).clip(0) * df.time_factor,,,,,,,coef_xwait_long,,,,,,
util_WALK_COM_number_of_transfers,WALK_COM - number of transfers,@(odt_skims['WLK_COM_WLK_BOARDS']-1).clip(0) * df.time_factor,,,,,,,coef_xfer,,,,,,
util_WALK_COM_Walk_access_time,WALK_COM - Walk access time,@df.origin_walk_time * df.time_factor,,,,,,,coef_walktime_short,,,,,,
util_WALK_COM_Walk_egress_time,WALK_COM - Walk egress time,@df.destination_walk_time * df.time_factor,,,,,,,coef_walktime_short,,,,,,
util_WALK_COM_Walk_other_time,WALK_COM - Walk other time,@odt_skims['WLK_COM_WLK_WAUX'] * df.time_factor,,,,,,,coef_walktime_short,,,,,,
util_WALK_COM_Fare,WALK_COM - Fare,"@odt_skims['WLK_COM_WLK_FAR']/(np.maximum(df.income,1000)**df.income_exponent)",,,,,,,coef_inc_adj_cost,,,,,,
util_WALK_COM_Destination_zone_densityIndex,WALK_COM - Destination zone densityIndex,@df.density_index,,,,,,,coef_density_index,,,,,,
util_WALK_COM_Topology,WALK_COM - Topology,@df.trip_topology,,,,,,,coef_topology_trn,,,,,,
util_WALK_COM_In_vehicle_time_not_on_commuter_rail,WALK_COM - In-vehicle time not on commuter rail,@(odt_skims['WLK_COM_WLK_TOTIVT'] - odt_skims['WLK_COM_WLK_KEYIVT']) * df.time_factor,,,,,,,,,coef_ivt,,,,
util_WALK_COM_In_vehicle_time_on_commuter_rail,WALK_COM - In-vehicle time on commuter rail (incremental w/ ivt),@odt_skims['WLK_COM_WLK_KEYIVT'] * df.time_factor,,,,,,,,,coef_ivt_com,,,,
util_WALK_COM_Short_iwait_time,WALK_COM - Short iwait time,@(odt_skims['WLK_COM_WLK_IWAIT']).clip(upper=waitThresh) * df.time_factor,,,,,,,,,coef_iwait_short,,,,
util_WALK_COM_Long_iwait_time,WALK_COM - Long iwait time,@(odt_skims['WLK_COM_WLK_IWAIT']-waitThresh).clip(0) * df.time_factor,,,,,,,,,coef_iwait_long,,,,
util_WALK_COM_Short_transfer_wait_time,WALK_COM - Short transfer wait time,@(odt_skims['WLK_COM_WLK_XWAIT']).clip(upper=waitThresh) * df.time_factor,,,,,,,,,coef_xwait_short,,,,
util_WALK_COM_Long_transfer_wait_time,WALK_COM - Long transfer wait time,@(odt_skims['WLK_COM_WLK_XWAIT']-waitThresh).clip(0) * df.time_factor,,,,,,,,,coef_xwait_long,,,,
util_WALK_COM_number_of_transfers,WALK_COM - number of transfers,@(odt_skims['WLK_COM_WLK_BOARDS']-1).clip(0) * df.time_factor,,,,,,,,,coef_xfer,,,,
util_WALK_COM_Walk_access_time,WALK_COM - Walk access time,@df.origin_walk_time * df.time_factor,,,,,,,,,coef_walktime_short,,,,
util_WALK_COM_Walk_egress_time,WALK_COM - Walk egress time,@df.destination_walk_time * df.time_factor,,,,,,,,,coef_walktime_short,,,,
util_WALK_COM_Walk_other_time,WALK_COM - Walk other time,@odt_skims['WLK_COM_WLK_WAUX'] * df.time_factor,,,,,,,,,coef_walktime_short,,,,
util_WALK_COM_Fare,WALK_COM - Fare,"@odt_skims['WLK_COM_WLK_FAR']/(np.maximum(df.income,1000)**df.income_exponent)",,,,,,,,,coef_inc_adj_cost,,,,
util_WALK_COM_Destination_zone_densityIndex,WALK_COM - Destination zone densityIndex,@df.density_index,,,,,,,,,coef_density_index,,,,
util_WALK_COM_Topology,WALK_COM - Topology,@df.trip_topology,,,,,,,,,coef_topology_trn,,,,
util_WALK_COM_Person_is_less_than_10_years_old,WALK_COM - Person is less than 10 years old,@(df.age < 10),,,,,,,,,coef_age010_trn,,,,
#,Drive to Transit,,,,,,,,,,,,,,s
#,Drive to Transit,,,,,,,,,,,,,,
util_DRIVE_TRN_Unavailable_for_zero_auto_households,DRIVE_TRN - Unavailable for zero auto households,auto_ownership == 0,,,,,,,,,,-999,,,
util_DRIVE_TRN_Unavailable_for_persons_less_than_16,DRIVE_TRN - Unavailable for persons less than 16,age < 16,,,,,,,,,,-999,,,
util_DRIVE_TRN_Destination_zone_densityIndex,DRIVE_TRN - Destination zone densityIndex,@df.density_index,,,,,,,,,,coef_density_index,,,
Expand Down Expand Up @@ -175,7 +175,7 @@ util_Walk_tour_mode_ASC_ride_hail,Walk tour mode ASC -- ride hail,@df.is_indiv &
util_Bike_tour_mode_ASC_walk,Bike tour mode ASC -- walk,@df.is_indiv & (df.i_tour_mode == I_BIKE_MODE),,,,bike_ASC_walk,,,,,,,,,
util_Bike_tour_mode_ASC_ride_hail,Bike tour mode ASC -- ride hail,@df.is_indiv & (df.i_tour_mode == I_BIKE_MODE),,,,,,,,,,,bike_ASC_rh,bike_ASC_rh,bike_ASC_rh
util_Walk_to_Transit_tour_mode_ASC_light_rail,Walk to Transit tour mode ASC -- light rail,@(df.is_indiv & df.tour_mode_is_walk_transit & ~df.walk_ferry_available),,,,,,,walk_transit_ASC_lightrail,,,,,,
util_Walk_to_Transit_tour_mode_ASC_ferry,Walk to Transit tour mode ASC -- ferry,@(df.is_indiv & df.tour_mode_is_walk_transit & df.walk_ferry_available),,,,,,,walk_transit_ASC_ferry,,,,,,
util_Walk_to_Transit_tour_mode_ASC_ferry,Walk to Transit tour mode ASC -- ferry,@(df.is_indiv & df.tour_mode_is_walk_transit & df.walk_ferry_available),,,,,,,,walk_transit_ASC_ferry,,,,,
util_Walk_to_Transit_tour_mode_ASC_commuter_rail,Walk to Transit tour mode ASC -- commuter rail,@(df.is_indiv & df.tour_mode_is_walk_transit),,,,,,,,,walk_transit_ASC_commuter,,,,
util_Walk_to_Transit_tour_mode_ASC_shared_ride_2,Walk to Transit tour mode ASC -- shared ride 2,@(df.is_indiv & df.tour_mode_is_walk_transit),,walk_transit_ASC_sr2,,,,,,,,,,,
util_Walk_to_Transit_tour_mode_ASC_shared_ride_3_plus,Walk to Transit tour mode ASC -- shared ride 3+,@(df.is_indiv & df.tour_mode_is_walk_transit),,,walk_transit_ASC_sr3p,,,,,,,,,,
Expand All @@ -198,7 +198,7 @@ util_joint_Walk_tour_mode_ASC_ride_hail,joint - Walk tour mode ASC -- ride hail,
util_joint_Bike_tour_mode_ASC_walk,joint - Bike tour mode ASC -- walk,@df.is_joint & (df.i_tour_mode == I_BIKE_MODE),,,,joint_bike_ASC_walk,,,,,,,,,
util_joint_Bike_tour_mode_ASC_ride_hail,joint - Bike tour mode ASC -- ride hail,@df.is_joint & (df.i_tour_mode == I_BIKE_MODE),,,,,,,,,,,joint_bike_ASC_rh,joint_bike_ASC_rh,joint_bike_ASC_rh
util_joint_Walk_to_Transit_tour_mode_ASC_light_rail,joint - Walk to Transit tour mode ASC -- light rail,@(df.is_joint & df.tour_mode_is_walk_transit & ~df.walk_ferry_available),,,,,,,joint_walk_transit_ASC_lightrail,,,,,,
util_joint_Walk_to_Transit_tour_mode_ASC_ferry,joint - Walk to Transit tour mode ASC -- ferry,@(df.is_joint & df.tour_mode_is_walk_transit & df.walk_ferry_available),,,,,,,joint_walk_transit_ASC_ferry,,,,,,
util_joint_Walk_to_Transit_tour_mode_ASC_ferry,joint - Walk to Transit tour mode ASC -- ferry,@(df.is_joint & df.tour_mode_is_walk_transit & df.walk_ferry_available),,,,,,,,joint_walk_transit_ASC_ferry,,,,,
util_joint_Walk_to_Transit_tour_mode_ASC_commuter_rail,joint - Walk to Transit tour mode ASC -- commuter rail,@(df.is_joint & df.tour_mode_is_walk_transit),,,,,,,,,joint_walk_transit_ASC_commuter,,,,
util_joint_Walk_to_Transit_tour_mode_ASC_shared_ride_2,joint - Walk to Transit tour mode ASC -- shared ride 2,@(df.is_joint & df.tour_mode_is_walk_transit),,joint_walk_transit_ASC_sr2,,,,,,,,,,,
util_joint_Walk_to_Transit_tour_mode_ASC_shared_ride_3_plus,joint - Walk to Transit tour mode ASC -- shared ride 3+,@(df.is_joint & df.tour_mode_is_walk_transit),,,joint_walk_transit_ASC_sr3p,,,,,,,,,,
Expand Down

0 comments on commit a7d0f20

Please sign in to comment.