From 6092354290a45aa4b771a8c18910b8bb4cd952de Mon Sep 17 00:00:00 2001 From: Vivek Yadav Date: Tue, 16 Apr 2024 13:45:04 -0400 Subject: [PATCH] Changing the skim reference in spec files --- configs/resident/trip_destination_sample.csv | 4 ++-- configs/resident/trip_mode_choice.csv | 2 +- configs/resident/trip_mode_choice_annotate_trips.csv | 4 ++-- .../resident/trip_mode_choice_annotate_trips_preprocessor.csv | 4 ++-- .../write_trip_matrices_annotate_trips_preprocessor.csv | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/resident/trip_destination_sample.csv b/configs/resident/trip_destination_sample.csv index 4572aad..cffed3d 100644 --- a/configs/resident/trip_destination_sample.csv +++ b/configs/resident/trip_destination_sample.csv @@ -2,8 +2,8 @@ Description,Expression,work,univ,school,escort,shopping,eatout,othmaint,social,o ,_od_DIST@od_skims['DIST'],1,1,1,1,1,1,1,1,1,1 ,_dp_DIST@dp_skims['DIST'],1,1,1,1,1,1,1,1,1,1 ,_op_DIST@op_skims['DIST'],1,1,1,1,1,1,1,1,1,1 -,_od_bikeL@od_skims['BIKE_LOGSUM'],1,1,1,1,1,1,1,1,1,1 -,_dp_bikeL@dp_skims['BIKE_LOGSUM'],1,1,1,1,1,1,1,1,1,1 +,_od_bikeL@odt_skims['BIKE_LOGSUM'],1,1,1,1,1,1,1,1,1,1 +,_dp_bikeL@dpt_skims['BIKE_LOGSUM'],1,1,1,1,1,1,1,1,1,1 # next line gets max MAZ micromobility access time in destination TAZ ,"_d_microAccTime@land_use.sort_values(by='MicroAccessTime',ascending=False).drop_duplicates('TAZ',keep='first').set_index('TAZ')['MicroAccessTime'].reindex(df.dest_taz)",1,1,1,1,1,1,1,1,1,1 #,,,,,,,,,,, diff --git a/configs/resident/trip_mode_choice.csv b/configs/resident/trip_mode_choice.csv index 402d280..a3500b0 100644 --- a/configs/resident/trip_mode_choice.csv +++ b/configs/resident/trip_mode_choice.csv @@ -330,7 +330,7 @@ util_TNC_MIX_In_vehicle_time_on_CMR,TNC_MIX - In-vehicle time on CMR,@(ivt_cmr_m util_TNC_MIX_In_vehicle_time_on_LTD_EXP,TNC_MIX - In-vehicle time on LTD and EXP,@(ivt_ltd_multiplier - 1) * (odt_skims['TNCOUT_MIX_LTDEXPIVTT']+ odt_skims['TNCOUT_MIX_EXPIVTT']) * df.time_factor * df.outbound,,,,,,,,,,,,,,,,,coef_ivt,,,,,, util_TNC_MIX_In_vehicle_time_on_URB,TNC_MIX - In-vehicle time on BRT,@(ivt_brt_multiplier - 1) * (odt_skims['TNCOUT_MIX_BRTIVTT']) * df.time_factor * df.outbound,,,,,,,,,,,,,,,,,coef_ivt,,,,,, util_TNC_MIX_FIRST_iwait_time,TNC_MIX - First iwait time,@(odt_skims['TNCOUT_MIX_FIRSTWAIT']) * df.time_factor * df.outbound,,,,,,,,,,,,,,,,,coef_wait,,,,,, -util_TNC_MIX_transfer_wait_time,TNC_MIX - transfer wait time,@ (odt_skims['TNCOUT_MIX_XFERWAIT']) * df.time_factor * df.outbound,,,,,,,,,,,,,,,,,coef_xwait,,,,,, +util_TNC_MIX_transfer_wait_time,TNC_MIX - transfer wait time,@(odt_skims['TNCOUT_MIX_XFERWAIT']) * df.time_factor * df.outbound,,,,,,,,,,,,,,,,,coef_xwait,,,,,, util_TNC_MIX_number_of_transfers,TNC_MIX - number of transfers,"@(-23+23*np.exp(0.414*np.clip(odt_skims['TNCOUT_MIX_XFERS'], a_min=None,a_max=4))) * df.time_factor * df.outbound",,,,,,,,,,,,,,,,,coef_xferdrive,,,,,, util_TNC_MIX_TNC_time,TNC_MIX - TNC time,@(odt_skims['TNCOUT_MIX_ACC']) * df.time_factor * df.outbound,,,,,,,,,,,,,,,,,coef_acctime,,,,,, util_TNC_MIX_Walk_egress_time_(at_attraction_end),TNC_MIX - Walk egress time (at attraction end),@(df.dest_mix_time) * df.time_factor * df.outbound,,,,,,,,,,,,,,,,,coef_acctime,,,,,, diff --git a/configs/resident/trip_mode_choice_annotate_trips.csv b/configs/resident/trip_mode_choice_annotate_trips.csv index ce3e85e..d60cd67 100644 --- a/configs/resident/trip_mode_choice_annotate_trips.csv +++ b/configs/resident/trip_mode_choice_annotate_trips.csv @@ -40,8 +40,8 @@ Description,Target,Expression ,distance_walk,"_distance_walk + _origin_mix_dist * np.where(df.trip_mode == 'TNC_MIX',1,0) * np.where(~df.outbound,1,0)" #,, ,_time_mm,0 -,_time_mm,"_time_mm + df.trip_mode.isin(['EBIKE'])* od_skims['BIKE_TIME'] * bikeSpeed / ebikeSpeed" -,time_mm,"_time_mm + df.trip_mode.isin(['ESCOOTER'])*od_skims['BIKE_TIME'] * bikeSpeed / escooterSpeed" +,_time_mm,"_time_mm + df.trip_mode.isin(['EBIKE'])* odt_skims['BIKE_TIME'] * bikeSpeed / ebikeSpeed" +,time_mm,"_time_mm + df.trip_mode.isin(['ESCOOTER'])*odt_skims['BIKE_TIME'] * bikeSpeed / escooterSpeed" ,_distance_mm,0 ,_distance_mm,"_distance_mm + df.trip_mode.isin(['EBIKE'])*od_skims['BIKE_TIME'] * (bikeSpeed/ebikeSpeed)/60 * ebikeSpeed" ,distance_mm,"_distance_mm + df.trip_mode.isin(['ESCOOTER'])*od_skims['BIKE_TIME'] * (bikeSpeed/escooterSpeed)/60 * escooterSpeed" diff --git a/configs/resident/trip_mode_choice_annotate_trips_preprocessor.csv b/configs/resident/trip_mode_choice_annotate_trips_preprocessor.csv index 54a5bb2..14dc62c 100644 --- a/configs/resident/trip_mode_choice_annotate_trips_preprocessor.csv +++ b/configs/resident/trip_mode_choice_annotate_trips_preprocessor.csv @@ -185,8 +185,8 @@ Final parking cost,parkingCost,parkCostTourDestContrib + parkCostTripOrigContrib Origin Terminal Time,oTermTime,"reindex(land_use.terminal_time,origin)" Destination Terminal Time,dTermTime,"reindex(land_use.terminal_time,destination)" #,, -bike logsum,bikeLS,od_skims['BIKE_LOGSUM'] -bike time inbound,bike_time,od_skims['BIKE_TIME'] +bike logsum,bikeLS,odt_skims['BIKE_LOGSUM'] +bike time inbound,bike_time,odt_skims['BIKE_TIME'] #,, "Cost factor for shared 2 tours, 1/(2^0.8)",costFactorS2,0.57 "Cost factor for shared 3+ tours, 1/(3.5^0.8)",costFactorS3,0.37 diff --git a/configs/resident/write_trip_matrices_annotate_trips_preprocessor.csv b/configs/resident/write_trip_matrices_annotate_trips_preprocessor.csv index 7b9df1a..379f21b 100644 --- a/configs/resident/write_trip_matrices_annotate_trips_preprocessor.csv +++ b/configs/resident/write_trip_matrices_annotate_trips_preprocessor.csv @@ -435,7 +435,7 @@ Description,Target,Expression ,_transfersTransit,"_transfersTransit + odt_skims['TNCIN_PRM_XFERS'] * np.where(trips.trip_mode == 'TNC_PRM',1,0) * np.where(~trips.outbound,1,0)" ,transfersTransit,"_transfersTransit + odt_skims['TNCIN_MIX_XFERS'] * np.where(trips.trip_mode == 'TNC_MIX',1,0) * np.where(~trips.outbound,1,0)" #bikeskim,, -,timeBike,"od_skims['BIKE_TIME'] * np.where(trips.trip_mode == 'BIKE',1,0)" +,timeBike,"odt_skims['BIKE_TIME'] * np.where(trips.trip_mode == 'BIKE',1,0)" ,timeWalk,"od_skims['walkTime'] * np.where(trips.trip_mode == 'WALK',1,0)" # totals,, ,cost_total, costOperatingDrive + costTollDrive + costFareTransit