Merge pull request #274 from SANDAG/escort_participants_string

Force AV allocation to read escort_participants as string

Author: bhargavasana

src/asim/configs/resident/write_trip_matrices_annotate_trips_preprocessor.csv

@@ -483,3 +483,5 @@ Description,Target,Expression
 ,origin_purpose,"np.where(trips.trip_count == 1 & (trips.primary_purpose == 'atwork'), 'work', origin_purpose)"
 ,origin_purpose,"np.where((trips.trip_count > 1) & (trips.trip_num==1) & (trips.outbound), 'home', origin_purpose)"
 ,origin_purpose,"np.where(((trips.trip_count > 1) & (trips.trip_num>1)) | ((trips.trip_count > 1) & (trips.trip_num==1) & ~(trips.outbound)), trips['purpose'].shift(1), origin_purpose)"
+#AV allocation model needs column to be entirely in string format,,
+,escort_participants,"np.where(trips.escort_participants.isna() | trips.escort_participants == '',trips.escort_participants,'_'+trips.escort_participants)"

src/asim/visualizer/visualizer/config/user_added_functions.py

@@ -1,6 +1,6 @@
 def get_escort_participant_list(escort_participants):
     if type(escort_participants) == str:
-        return [int(participant) for participant in escort_participants.split('_')]
+        return [int(participant) for participant in escort_participants.split('_')[1:]]
     else:
         return []