Merge pull request #801 from camsys/bugfix-801

`cleanup_failed_trips` requires workflow state
ActivitySim · Feb 16, 2024 · 03a6720 · 03a6720
2 parents c0305bd + c9e72a8
commit 03a6720
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/activitysim/abm/models/trip_destination.py b/activitysim/abm/models/trip_destination.py
@@ -1598,7 +1598,7 @@ def trip_destination(
                     trips_df.index[trips_df.failed], level="trip_id", inplace=True
                 )
 
-            trips_df = cleanup_failed_trips(trips_df)
+            trips_df = cleanup_failed_trips(state, trips_df)
 
         trips_df.drop(columns="failed", inplace=True, errors="ignore")
 

diff --git a/activitysim/abm/models/trip_purpose_and_destination.py b/activitysim/abm/models/trip_purpose_and_destination.py
@@ -238,7 +238,7 @@ def trip_purpose_and_destination(
         state.settings.downcast_float,
     )
 
-    trips_df = cleanup_failed_trips(trips_df)
+    trips_df = cleanup_failed_trips(state, trips_df)
 
     state.add_table("trips", trips_df)
 

diff --git a/activitysim/abm/models/trip_scheduling.py b/activitysim/abm/models/trip_scheduling.py
@@ -660,7 +660,7 @@ def trip_scheduling(
             )
 
         trips_df["failed"] = choices.isnull()
-        trips_df = cleanup_failed_trips(trips_df)
+        trips_df = cleanup_failed_trips(state, trips_df)
         choices = choices.reindex(trips_df.index)
 
     trips_df["depart"] = choices

diff --git a/activitysim/abm/models/util/trip.py b/activitysim/abm/models/util/trip.py
@@ -52,7 +52,7 @@ def flag_failed_trip_leg_mates(trips_df, col_name):
     #     trips_df.loc[failed_trip_leg_mates, col_name] = True
 
 
-def cleanup_failed_trips(trips):
+def cleanup_failed_trips(state: workflow.State, trips: pd.DataFrame):
     """
     drop failed trips and cleanup fields in leg_mates: