From 64320e56b4dd87459c78609a7d6269b77f025905 Mon Sep 17 00:00:00 2001 From: David Hensle Date: Thu, 9 May 2024 09:10:56 -0700 Subject: [PATCH] alts sample preprocessor --- configs/resident/trip_destination.csv | 2 +- configs/resident/trip_destination.yaml | 16 ++++++++++++---- ...ip_destination_annotate_alts_preprocessor.csv | 2 -- ...ination_annotate_alts_preprocessor_sample.csv | 2 ++ configs/resident/trip_destination_sample.csv | 4 ++-- 5 files changed, 17 insertions(+), 9 deletions(-) delete mode 100644 configs/resident/trip_destination_annotate_alts_preprocessor.csv create mode 100644 configs/resident/trip_destination_annotate_alts_preprocessor_sample.csv diff --git a/configs/resident/trip_destination.csv b/configs/resident/trip_destination.csv index e381878..579c732 100644 --- a/configs/resident/trip_destination.csv +++ b/configs/resident/trip_destination.csv @@ -6,7 +6,7 @@ local_dist_nd,,_nd_DIST@nd_skims['DIST'],1,1,1,1,1,1,1,1,1,1 distance_deviation,distance deviation,_dist_dev@(_od_DIST +_dp_DIST - _op_DIST),1,1,1,1,1,1,1,1,1,1 dist_deviation_logged,logged deviation distance,"_dist_dev_logged@np.where((_dist_dev > 0), np.log(_dist_dev),0)",1,1,1,1,1,1,1,1,1,1 #,,,,,,,,,,,, -util_sizeterm,size term,"@np.log1p(size_terms.get(df.dest_maz, df.purpose)) # sharrow: np.log1p(size_terms['sizearray'])",coef_one,coef_one,coef_one,coef_one,coef_one,coef_one,coef_one,coef_one,coef_one,coef_one +util_sizeterm,size term,"@np.log1p(size_terms.get(df.alt_dest, df.purpose)) # sharrow: np.log1p(size_terms['sizearray'])",coef_one,coef_one,coef_one,coef_one,coef_one,coef_one,coef_one,coef_one,coef_one,coef_one util_Sampleofalternativescorrectionfactor,Sample of alternatives correction factor,"@np.minimum(np.log(df.pick_count/df.prob), 60)",coef_one,coef_one,coef_one,coef_one,coef_one,coef_one,coef_one,coef_one,coef_one,coef_one util_Modechoicelogsum,Mode choice logsum,od_logsum + dp_logsum,coef_mode_choice_logsum_mandatory,coef_mode_choice_logsum_mandatory,coef_mode_choice_logsum_mandatory,coef_mode_choice_logsum_maint,coef_mode_choice_logsum_maint,coef_mode_choice_logsum_maint,coef_mode_choice_logsum_discr,coef_mode_choice_logsum_discr,coef_mode_choice_logsum_discr,coef_mode_choice_logsum_discr #,,,,,,,,,,,, diff --git a/configs/resident/trip_destination.yaml b/configs/resident/trip_destination.yaml index 6524041..eadf262 100644 --- a/configs/resident/trip_destination.yaml +++ b/configs/resident/trip_destination.yaml @@ -17,7 +17,7 @@ DEST_CHOICE_SAMPLE_TABLE_NAME: trip_destination_sample # model-specific logsum-related settings TRIP_ORIGIN: origin -ALT_DEST_COL_NAME: dest_maz +ALT_DEST_COL_NAME: alt_dest PRIMARY_ORIGIN: tour_leg_origin PRIMARY_DEST: tour_leg_dest # must be created in preprocessor @@ -35,12 +35,20 @@ preprocessor: - households - land_use -alts_preprocessor: - SPEC: trip_destination_annotate_alts_preprocessor - DF: trips +# preprocessor for sample, operates on TAZs +alts_preprocessor_sample: + SPEC: trip_destination_annotate_alts_preprocessor_sample + DF: alternatives TABLES: - land_use +# preprocessor for simulate, operates on MAZs in two zone models +# alts_preprocessor_sample: +# SPEC: trip_destination_annotate_alts_preprocessor_simulate +# DF: alternatives +# TABLES: +# - land_use + # drop failed trips and cleanup failed trip leg_mates for consistency # (i.e. adjust trip_count, trip_num, first for missing failed trips) diff --git a/configs/resident/trip_destination_annotate_alts_preprocessor.csv b/configs/resident/trip_destination_annotate_alts_preprocessor.csv deleted file mode 100644 index ff03f08..0000000 --- a/configs/resident/trip_destination_annotate_alts_preprocessor.csv +++ /dev/null @@ -1,2 +0,0 @@ -Description,Target,Expression -micromobility access time at destination,d_microAccTime,"land_use['MicroAccessTime'].reindex(df.index)" diff --git a/configs/resident/trip_destination_annotate_alts_preprocessor_sample.csv b/configs/resident/trip_destination_annotate_alts_preprocessor_sample.csv new file mode 100644 index 0000000..ac03b86 --- /dev/null +++ b/configs/resident/trip_destination_annotate_alts_preprocessor_sample.csv @@ -0,0 +1,2 @@ +Description,Target,Expression +micromobility access time at destination taz,d_microAccTime,"land_use.groupby('TAZ')['MicroAccessTime'].agg('max').reindex(df.index)" diff --git a/configs/resident/trip_destination_sample.csv b/configs/resident/trip_destination_sample.csv index 52c1309..f2aa11a 100644 --- a/configs/resident/trip_destination_sample.csv +++ b/configs/resident/trip_destination_sample.csv @@ -5,8 +5,8 @@ Description,Expression,work,univ,school,escort,shopping,eatout,othmaint,social,o ,_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 #,,,,,,,,,,, -size term,"@np.log1p(size_terms.get(df.dest_maz, df.purpose)) # sharrow: np.log1p(size_terms['sizearray'])",1,1,1,1,1,1,1,1,1,1 -no attractions,"@size_terms.get(df.dest_maz, df.purpose) == 0 # sharrow: size_terms['sizearray'] == 0",-999,-999,-999,-999,-999,-999,-999,-999,-999,-999 +size term,"@np.log1p(size_terms.get(df.alt_dest, df.purpose)) # sharrow: np.log1p(size_terms['sizearray'])",1,1,1,1,1,1,1,1,1,1 +no attractions,"@size_terms.get(df.alt_dest, df.purpose) == 0 # sharrow: size_terms['sizearray'] == 0",-999,-999,-999,-999,-999,-999,-999,-999,-999,-999 #,,,,,,,,,,, ,"@df.walkTour * (np.where(_od_DIST > df.max_walk_distance,1,0) + np.where(_dp_DIST > df.max_walk_distance,1,0))",-10,-10,-10,-10,-10,-10,-10,-10,-10,-10 ,@df.walkTour * (_od_DIST + _dp_DIST),-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5