Merge 44d1e08 into 7156334

pysr/export_sympy.py

@@ -64,9 +64,13 @@ def create_sympy_symbols(
 
 
 def pysr2sympy(
-    equation: str, *, extra_sympy_mappings: Optional[Dict[str, Callable]] = None
+    equation: str,
+    feature_names_in: List[str],
+    *,
+    extra_sympy_mappings: Optional[Dict[str, Callable]] = None,
 ):
     local_sympy_mappings = {
+        **{f: sympy.Symbol(f) for f in feature_names_in},
         **(extra_sympy_mappings if extra_sympy_mappings else {}),
         **sympy_mappings,
     }

pysr/sr.py

@@ -2226,6 +2226,7 @@ def get_hof(self):
             for _, eqn_row in output.iterrows():
                 eqn = pysr2sympy(
                     eqn_row["equation"],
+                    self.feature_names_in_,
                     extra_sympy_mappings=self.extra_sympy_mappings,
                 )
                 sympy_format.append(eqn)

pysr/test/test.py

@@ -654,6 +654,19 @@ def test_bad_variable_names_fail(self):
             model.fit(X, y, variable_names=["f{c}"])
         self.assertIn("Invalid variable name", str(cm.exception))
 
+    def test_python_built_in_python_funcs_as_variable_names(self):
+        model = PySRRegressor()
+        X = np.random.randn(100, 2)
+        y = np.random.randn(100)
+
+        # Should not throw an error
+        try:
+            model.fit(X, y, variable_names=["exec", "hash"])
+        except Exception:
+            self.fail(
+                "Should not have thrown when a variable name is a builtin_function_or_method"
+            )
+
     def test_bad_kwargs(self):
         bad_kwargs = [
             dict(