protect columns in all simulate

i-am-sijia · i-am-sijia · commit 28fdbb6e9e1c · 2024-05-13T18:51:02.000-04:00
diff --git a/activitysim/core/configuration/base.py b/activitysim/core/configuration/base.py
@@ -243,6 +243,7 @@ def subcomponent_settings(self, subcomponent: str) -> ComputeSettings:
             use_numexpr=self.use_numexpr,
             use_numba=self.use_numba,
             drop_unused_columns=self.drop_unused_columns,
+            protect_columns=self.protect_columns,
         )
 
 
diff --git a/activitysim/core/interaction_sample.py b/activitysim/core/interaction_sample.py
@@ -257,6 +257,7 @@ def _interaction_sample(
             locals_d,
             custom_chooser=None,
             sharrow_enabled=sharrow_enabled,
+            additional_columns=compute_settings.protect_columns,
         )
 
         alternatives = util.drop_unused_columns(
@@ -265,7 +266,7 @@ def _interaction_sample(
             locals_d,
             custom_chooser=None,
             sharrow_enabled=sharrow_enabled,
-            additional_columns=["tdd", "origin_destination"],
+            additional_columns=compute_settings.protect_columns,
         )
 
     if sharrow_enabled:
diff --git a/activitysim/core/interaction_sample_simulate.py b/activitysim/core/interaction_sample_simulate.py
@@ -158,6 +158,7 @@ def _interaction_sample_simulate(
             locals_d,
             custom_chooser=None,
             sharrow_enabled=sharrow_enabled,
+            additional_columns=compute_settings.protect_columns,
         )
 
         alternatives = util.drop_unused_columns(
@@ -166,7 +167,7 @@ def _interaction_sample_simulate(
             locals_d,
             custom_chooser=None,
             sharrow_enabled=sharrow_enabled,
-            additional_columns=["tdd", "origin_destination"],
+            additional_columns=compute_settings.protect_columns,
         )
 
     interaction_df = alternatives.join(choosers, how="left", rsuffix="_chooser")
diff --git a/activitysim/core/interaction_simulate.py b/activitysim/core/interaction_simulate.py
@@ -729,6 +729,7 @@ def _interaction_simulate(
             locals_d,
             custom_chooser=None,
             sharrow_enabled=sharrow_enabled,
+            additional_columns=compute_settings.protect_columns,
         )
 
     if (
diff --git a/activitysim/core/simulate.py b/activitysim/core/simulate.py
@@ -1989,6 +1989,7 @@ def _simple_simulate_logsums(
             locals_d,
             custom_chooser=None,
             sharrow_enabled=state.settings.sharrow,
+            additional_columns=compute_settings.protect_columns,
         )
 
     if nest_spec is None:

Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,7 @@ def subcomponent_settings(self, subcomponent: str) -> ComputeSettings:`
`243`	`243`	`use_numexpr=self.use_numexpr,`
`244`	`244`	`use_numba=self.use_numba,`
`245`	`245`	`drop_unused_columns=self.drop_unused_columns,`
	`246`	`+ protect_columns=self.protect_columns,`
`246`	`247`	`)`
`247`	`248`
`248`	`249`
Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,7 @@ def _interaction_sample(`
`257`	`257`	`locals_d,`
`258`	`258`	`custom_chooser=None,`
`259`	`259`	`sharrow_enabled=sharrow_enabled,`
	`260`	`+ additional_columns=compute_settings.protect_columns,`
`260`	`261`	`)`
`261`	`262`
`262`	`263`	`alternatives = util.drop_unused_columns(`
`@@ -265,7 +266,7 @@ def _interaction_sample(`
`265`	`266`	`locals_d,`
`266`	`267`	`custom_chooser=None,`
`267`	`268`	`sharrow_enabled=sharrow_enabled,`
`268`		`- additional_columns=["tdd", "origin_destination"],`
	`269`	`+ additional_columns=compute_settings.protect_columns,`
`269`	`270`	`)`
`270`	`271`
`271`	`272`	`if sharrow_enabled:`
Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ def _interaction_sample_simulate(`
`158`	`158`	`locals_d,`
`159`	`159`	`custom_chooser=None,`
`160`	`160`	`sharrow_enabled=sharrow_enabled,`
	`161`	`+ additional_columns=compute_settings.protect_columns,`
`161`	`162`	`)`
`162`	`163`
`163`	`164`	`alternatives = util.drop_unused_columns(`
`@@ -166,7 +167,7 @@ def _interaction_sample_simulate(`
`166`	`167`	`locals_d,`
`167`	`168`	`custom_chooser=None,`
`168`	`169`	`sharrow_enabled=sharrow_enabled,`
`169`		`- additional_columns=["tdd", "origin_destination"],`
	`170`	`+ additional_columns=compute_settings.protect_columns,`
`170`	`171`	`)`
`171`	`172`
`172`	`173`	`interaction_df = alternatives.join(choosers, how="left", rsuffix="_chooser")`
Original file line number	Diff line number	Diff line change
`@@ -729,6 +729,7 @@ def _interaction_simulate(`
`729`	`729`	`locals_d,`
`730`	`730`	`custom_chooser=None,`
`731`	`731`	`sharrow_enabled=sharrow_enabled,`
	`732`	`+ additional_columns=compute_settings.protect_columns,`
`732`	`733`	`)`
`733`	`734`
`734`	`735`	`if (`
Original file line number	Diff line number	Diff line change
`@@ -1989,6 +1989,7 @@ def _simple_simulate_logsums(`
`1989`	`1989`	`locals_d,`
`1990`	`1990`	`custom_chooser=None,`
`1991`	`1991`	`sharrow_enabled=state.settings.sharrow,`
	`1992`	`+ additional_columns=compute_settings.protect_columns,`
`1992`	`1993`	`)`
`1993`	`1994`
`1994`	`1995`	`if nest_spec is None:`