diff --git a/src/asim/configs/common_airport/write_trip_matrices_annotate_trips_preprocessor.csv b/src/asim/configs/common_airport/write_trip_matrices_annotate_trips_preprocessor.csv index d17d504f5..0451a8d25 100644 --- a/src/asim/configs/common_airport/write_trip_matrices_annotate_trips_preprocessor.csv +++ b/src/asim/configs/common_airport/write_trip_matrices_annotate_trips_preprocessor.csv @@ -360,27 +360,27 @@ Description,Target,Expression ,_timeTransitInitialWait,"_timeTransitInitialWait + odt_skims['TNCIN_PRM_FIRSTWAIT'] * np.where(trip_mode == 'TNC_PRM',1,0) * np.where(~outbound,1,0)" ,_timeTransitInitialWait,"_timeTransitInitialWait + odt_skims['TNCIN_MIX_FIRSTWAIT'] * np.where(trip_mode == 'TNC_MIX',1,0) * np.where(~outbound,1,0)" #,, -,_costFareTransit,"odt_skims['WALK_LOC_FARE'] * np.where(trip_mode == 'WALK_LOC',1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['WALK_PRM_FARE'] * np.where(trip_mode == 'WALK_PRM',1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['WALK_MIX_FARE'] * np.where(trip_mode == 'WALK_MIX',1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['PNROUT_LOC_FARE'] * np.where(trip_mode == 'PNR_LOC',1,0) * np.where(outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['PNROUT_PRM_FARE'] * np.where(trip_mode == 'PNR_PRM',1,0) * np.where(outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['PNROUT_MIX_FARE'] * np.where(trip_mode == 'PNR_MIX',1,0) * np.where(outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['KNROUT_LOC_FARE'] * np.where(trip_mode == 'KNR_LOC',1,0) * np.where(outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['KNROUT_PRM_FARE'] * np.where(trip_mode == 'KNR_PRM',1,0) * np.where(outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['KNROUT_MIX_FARE'] * np.where(trip_mode == 'KNR_MIX',1,0) * np.where(outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['TNCOUT_LOC_FARE'] * np.where(trip_mode == 'TNC_LOC',1,0) * np.where(outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['TNCOUT_PRM_FARE'] * np.where(trip_mode == 'TNC_PRM',1,0) * np.where(outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['TNCOUT_MIX_FARE'] * np.where(trip_mode == 'TNC_MIX',1,0) * np.where(outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['PNRIN_LOC_FARE'] * np.where(trip_mode == 'PNR_LOC',1,0) * np.where(~outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['PNRIN_PRM_FARE'] * np.where(trip_mode == 'PNR_PRM',1,0) * np.where(~outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['PNRIN_MIX_FARE'] * np.where(trip_mode == 'PNR_MIX',1,0) * np.where(~outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['KNRIN_LOC_FARE'] * np.where(trip_mode == 'KNR_LOC',1,0) * np.where(~outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['KNRIN_PRM_FARE'] * np.where(trip_mode == 'KNR_PRM',1,0) * np.where(~outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['KNRIN_MIX_FARE'] * np.where(trip_mode == 'KNR_MIX',1,0) * np.where(~outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['TNCIN_LOC_FARE'] * np.where(trip_mode == 'TNC_LOC',1,0) * np.where(~outbound,1,0)" -,_costFareTransit,"_costFareTransit + odt_skims['TNCIN_PRM_FARE'] * np.where(trip_mode == 'TNC_PRM',1,0) * np.where(~outbound,1,0)" -,costFareTransit,"_costFareTransit + odt_skims['TNCIN_MIX_FARE'] * np.where(trip_mode == 'TNC_MIX',1,0) * np.where(~outbound,1,0)" +,_costFareTransit,"odt_skims['WALK_LOC_FARE'] * 100 * np.where(trip_mode == 'WALK_LOC',1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['WALK_PRM_FARE'] * 100 * np.where(trip_mode == 'WALK_PRM',1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['WALK_MIX_FARE'] * 100 * np.where(trip_mode == 'WALK_MIX',1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['PNROUT_LOC_FARE'] * 100 * np.where(trip_mode == 'PNR_LOC',1,0) * np.where(outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['PNROUT_PRM_FARE'] * 100 * np.where(trip_mode == 'PNR_PRM',1,0) * np.where(outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['PNROUT_MIX_FARE'] * 100 * np.where(trip_mode == 'PNR_MIX',1,0) * np.where(outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['KNROUT_LOC_FARE'] * 100 * np.where(trip_mode == 'KNR_LOC',1,0) * np.where(outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['KNROUT_PRM_FARE'] * 100 * np.where(trip_mode == 'KNR_PRM',1,0) * np.where(outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['KNROUT_MIX_FARE'] * 100 * np.where(trip_mode == 'KNR_MIX',1,0) * np.where(outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['TNCOUT_LOC_FARE'] * 100 * np.where(trip_mode == 'TNC_LOC',1,0) * np.where(outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['TNCOUT_PRM_FARE'] * 100 * np.where(trip_mode == 'TNC_PRM',1,0) * np.where(outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['TNCOUT_MIX_FARE'] * 100 * np.where(trip_mode == 'TNC_MIX',1,0) * np.where(outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['PNRIN_LOC_FARE'] * 100 * np.where(trip_mode == 'PNR_LOC',1,0) * np.where(~outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['PNRIN_PRM_FARE'] * 100 * np.where(trip_mode == 'PNR_PRM',1,0) * np.where(~outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['PNRIN_MIX_FARE'] * 100 * np.where(trip_mode == 'PNR_MIX',1,0) * np.where(~outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['KNRIN_LOC_FARE'] * 100 * np.where(trip_mode == 'KNR_LOC',1,0) * np.where(~outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['KNRIN_PRM_FARE'] * 100 * np.where(trip_mode == 'KNR_PRM',1,0) * np.where(~outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['KNRIN_MIX_FARE'] * 100 * np.where(trip_mode == 'KNR_MIX',1,0) * np.where(~outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['TNCIN_LOC_FARE'] * 100 * np.where(trip_mode == 'TNC_LOC',1,0) * np.where(~outbound,1,0)" +,_costFareTransit,"_costFareTransit + odt_skims['TNCIN_PRM_FARE'] * 100 * np.where(trip_mode == 'TNC_PRM',1,0) * np.where(~outbound,1,0)" +,costFareTransit,"_costFareTransit + odt_skims['TNCIN_MIX_FARE'] * 100 * np.where(trip_mode == 'TNC_MIX',1,0) * np.where(~outbound,1,0)" #,, ,_transfersTransit,"odt_skims['WALK_LOC_XFERS'] * np.where(trip_mode == 'WALK_LOC',1,0)" ,_transfersTransit,"_transfersTransit + odt_skims['WALK_PRM_XFERS'] * np.where(trip_mode == 'WALK_PRM',1,0)"