From c0cdb32a23a58f34d530d4e22deb46d2c8b83ff6 Mon Sep 17 00:00:00 2001 From: Jeff Newman Date: Wed, 1 May 2024 20:14:40 -0500 Subject: [PATCH] use ALTS_ATTRIBUTES_SAMPLING --- configs/resident/trip_destination.yaml | 6 +++--- configs/resident/trip_destination_sample.csv | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/resident/trip_destination.yaml b/configs/resident/trip_destination.yaml index 9a245e8..be1926d 100644 --- a/configs/resident/trip_destination.yaml +++ b/configs/resident/trip_destination.yaml @@ -21,6 +21,9 @@ ALT_DEST_COL_NAME: dest_taz PRIMARY_ORIGIN: tour_leg_origin PRIMARY_DEST: tour_leg_dest # must be created in preprocessor +ALTS_ATTRIBUTES_SAMPLING: + - taz_microAccTime + # tour_mode is already in trips table, so we don't need it from tours # (it is assigned in trip_destination_annotate_trips_preprocessor ) REDUNDANT_TOURS_MERGED_CHOOSER_COLUMNS: @@ -44,6 +47,3 @@ CLEANUP: False # this setting is used by testing code to force failed trip_destination # fail_some_trips_for_testing: False - -compute_settings: - sharrow_skip: true \ No newline at end of file diff --git a/configs/resident/trip_destination_sample.csv b/configs/resident/trip_destination_sample.csv index 203088b..3c10367 100644 --- a/configs/resident/trip_destination_sample.csv +++ b/configs/resident/trip_destination_sample.csv @@ -4,8 +4,6 @@ Description,Expression,work,univ,school,escort,shopping,eatout,othmaint,social,o ,_op_DIST@op_skims['DIST'],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 #,,,,,,,,,,, size term,"@np.log1p(size_terms.get(df.dest_taz, 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_taz, df.purpose) == 0 # sharrow: size_terms['sizearray'] == 0",-999,-999,-999,-999,-999,-999,-999,-999,-999,-999 @@ -19,4 +17,4 @@ no attractions,"@size_terms.get(df.dest_taz, df.purpose) == 0 # sharrow: size_te ,@df.bikeTour * (_dp_bikeL < -300),-999,-999,-999,-999,-999,-999,-999,-999,-999,-999 #,,,,,,,,,,, ,@(df.nonmotorTour==0) * (_od_DIST + _dp_DIST - _op_DIST),-0.05,-0.05,-0.05,-0.05,-0.05,-0.05,-0.05,-0.05,-0.05,-0.05 -,"@(df.microTour * (np.where(_d_microAccTime > microAccessThreshold,1,0) + np.where(df.o_MicroAccessTime > microAccessThreshold,1,0)))",-10,-10,-10,-10,-10,-10,-10,-10,-10,-10 +,"@(df.microTour * (np.where(df.taz_microAccTime > microAccessThreshold,1,0) + np.where(df.o_MicroAccessTime > microAccessThreshold,1,0)))",-10,-10,-10,-10,-10,-10,-10,-10,-10,-10