use ALTS_ATTRIBUTES_SAMPLING

camsys · May 2, 2024 · c0cdb32 · c0cdb32
1 parent 106e631
commit c0cdb32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
diff --git 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