revert drop inplace

wsp-sag · Mar 26, 2024 · b6fd307 · b6fd307
1 parent 279987b
commit b6fd307
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 23 deletions.
diff --git a/activitysim/abm/models/trip_destination.py b/activitysim/abm/models/trip_destination.py
@@ -995,7 +995,7 @@ def choose_trip_destination(
     destination_sample = trip_destination_sample(
         state,
         primary_purpose=primary_purpose,
-        trips=trips.copy(),
+        trips=trips,
         alternatives=alternatives,
         model_settings=model_settings,
         size_term_matrix=size_term_matrix,
@@ -1023,7 +1023,7 @@ def choose_trip_destination(
     destination_sample = compute_logsums(
         state,
         primary_purpose=primary_purpose,
-        trips=trips.copy(),
+        trips=trips,
         destination_sample=destination_sample,
         tours_merged=tours_merged,
         model_settings=model_settings,
@@ -1036,7 +1036,7 @@ def choose_trip_destination(
     destinations = trip_destination_simulate(
         state,
         primary_purpose=primary_purpose,
-        trips=trips.copy(),
+        trips=trips,
         destination_sample=destination_sample,
         model_settings=model_settings,
         want_logsums=want_logsums,

diff --git a/activitysim/core/interaction_sample.py b/activitysim/core/interaction_sample.py
@@ -283,20 +283,19 @@ def _interaction_sample(
         unique_variables_in_spec.add("tour_mode")
         logger.info("Dropping unused variables in chooser table")
 
-        if "school_escorting" not in trace_label:
-            logger.info(
-                "before dropping, the choosers table has {} columns: {}".format(
-                    len(choosers.columns), choosers.columns
-                )
+        logger.info(
+            "before dropping, the choosers table has {} columns: {}".format(
+                len(choosers.columns), choosers.columns
             )
-            for c in choosers.columns:
-                if c not in unique_variables_in_spec:
-                    choosers.drop(c, axis=1, inplace=True)
-            logger.info(
-                "after dropping, the choosers table has {} columns: {}".format(
-                    len(choosers.columns), choosers.columns
-                )
+        )
+        for c in choosers.columns:
+            if c not in unique_variables_in_spec:
+                choosers = choosers.drop(c, axis=1)
+        logger.info(
+            "after dropping, the choosers table has {} columns: {}".format(
+                len(choosers.columns), choosers.columns
             )
+        )
 
     if sharrow_enabled:
         (

diff --git a/activitysim/core/interaction_sample_simulate.py b/activitysim/core/interaction_sample_simulate.py
@@ -188,10 +188,9 @@ def _interaction_sample_simulate(
         unique_variables_in_spec.add("parent_tour_id")
         logger.info("Dropping unused variables in chooser table")
 
-        if "school_escorting" not in trace_label:
-            for c in choosers.columns:
-                if c not in unique_variables_in_spec:
-                    choosers.drop(c, axis=1, inplace=True)
+        for c in choosers.columns:
+            if c not in unique_variables_in_spec:
+                choosers = choosers.drop(c, axis=1)
 
     interaction_df = alternatives.join(choosers, how="left", rsuffix="_chooser")
     logger.info(

diff --git a/activitysim/core/interaction_simulate.py b/activitysim/core/interaction_simulate.py
@@ -745,10 +745,9 @@ def _interaction_simulate(
 
         logger.info("Dropping unused variables in chooser table")
 
-        if "school_escorting" not in trace_label:
-            for c in choosers.columns:
-                if c not in unique_variables_in_spec:
-                    choosers.drop(c, axis=1, inplace=True)
+        for c in choosers.columns:
+            if c not in unique_variables_in_spec:
+                choosers = choosers.drop(c, axis=1)
 
     if locals_d is not None and locals_d.get("_sharrow_skip", False):
         sharrow_enabled = False