Merge branch 'master' of github.com:MilesCranmer/PySR

benchmarks/hyperparamopt.py

@@ -178,7 +178,7 @@ while True:
             max_evals=n + len(trials.trials),
             trials=trials,
             verbose=1,
-            rstate=np.random.RandomState(np.random.randint(1, 10 ** 6)),
+            rstate=np.random.RandomState(np.random.randint(1, 10**6)),
         )
     except hyperopt.exceptions.AllTrialsFailed:
         continue

pysr/sr.py

@@ -78,8 +78,8 @@ sympy_mappings = {
     "div": lambda x, y: x / y,
     "mult": lambda x, y: x * y,
     "sqrt_abs": lambda x: sympy.sqrt(abs(x)),
-    "square": lambda x: x ** 2,
-    "cube": lambda x: x ** 3,
+    "square": lambda x: x**2,
+    "cube": lambda x: x**3,
     "plus": lambda x, y: x + y,
     "sub": lambda x, y: x - y,
     "neg": lambda x: -x,

test/test.py

@@ -40,7 +40,7 @@ class TestPipeline(unittest.TestCase):
         y = self.X[:, [0, 1]] ** 2
         model = PySRRegressor(
             unary_operators=["sq(x) = x^2"],
-            extra_sympy_mappings={"sq": lambda x: x ** 2},
+            extra_sympy_mappings={"sq": lambda x: x**2},
             binary_operators=["plus"],
             verbosity=0,
             **self.default_test_kwargs,
@@ -65,7 +65,7 @@ class TestPipeline(unittest.TestCase):
         model = PySRRegressor(
             unary_operators=["sq(x) = x^2"],
             binary_operators=["plus"],
-            extra_sympy_mappings={"sq": lambda x: x ** 2},
+            extra_sympy_mappings={"sq": lambda x: x**2},
             **self.default_test_kwargs,
             procs=0,
             temp_equation_file=True,
@@ -121,7 +121,7 @@ class TestPipeline(unittest.TestCase):
             # Test that passing a single operator works:
             unary_operators="sq(x) = x^2",
             binary_operators="plus",
-            extra_sympy_mappings={"sq": lambda x: x ** 2},
+            extra_sympy_mappings={"sq": lambda x: x**2},
             **self.default_test_kwargs,
             procs=0,
             denoise=True,

test/test_torch.py

@@ -58,7 +58,7 @@ class TestTorch(unittest.TestCase):
 
     def test_mod_mapping(self):
         x, y, z = sympy.symbols("x y z")
-        expression = x ** 2 + sympy.atanh(sympy.Mod(y + 1, 2) - 1) * 3.2 * z
+        expression = x**2 + sympy.atanh(sympy.Mod(y + 1, 2) - 1) * 3.2 * z
 
         module = sympy2torch(expression, [x, y, z])