Merge pull request #512 from foxtran/feature/swap_operands

Wrap swap operands for binary ops

benchmarks/hyperparamopt.py

@@ -149,6 +149,8 @@ def run_trial(args):
         weight_mutate_constant=10.0,
         #     weight_mutate_operator=1,
         weight_mutate_operator=1.0,
+        #     weight_swap_operands=1,
+        weight_swap_operands=1.0,
         #     weight_randomize=1,
         weight_randomize=1.0,
         #     weight_simplify=0.002,

benchmarks/space.py

@@ -53,6 +53,10 @@
     weight_mutate_operator=hp.loguniform(
         "weight_mutate_operator", np.log(0.0001), np.log(100)
     ),
+    #     weight_swap_operands=1,
+    weight_swap_operands=hp.loguniform(
+        "weight_swap_operands", np.log(0.0001), np.log(100)
+    ),
     #     weight_randomize=1,
     weight_randomize=hp.loguniform("weight_randomize", np.log(0.0001), np.log(100)),
     #     weight_simplify=0.002,

pysr/deprecated.py

@@ -70,6 +70,7 @@ def make_deprecated_kwargs_for_pysr_regressor():
         weightInsertNode => weight_insert_node
         weightMutateConstant => weight_mutate_constant
         weightMutateOperator => weight_mutate_operator
+        weightSwapOperands => weight_swap_operands
         weightRandomize => weight_randomize
         weightSimplify => weight_simplify
         crossoverProbability => crossover_probability

pysr/param_groupings.yml

@@ -33,6 +33,7 @@
     - weight_do_nothing
     - weight_mutate_constant
     - weight_mutate_operator
+    - weight_swap_operands
     - weight_randomize
     - weight_simplify
     - weight_optimize

pysr/sr.py

@@ -387,6 +387,9 @@ class PySRRegressor(MultiOutputMixin, RegressorMixin, BaseEstimator):
     weight_mutate_operator : float
         Relative likelihood for mutation to swap an operator.
         Default is `0.47`.
+    weight_swap_operands : float
+        Relative likehood for swapping operands in binary operators.
+        Default is `0.0`.
     weight_randomize : float
         Relative likelihood for mutation to completely delete and then
         randomly generate the equation
@@ -700,6 +703,7 @@ def __init__(
         weight_do_nothing: float = 0.21,
         weight_mutate_constant: float = 0.048,
         weight_mutate_operator: float = 0.47,
+        weight_swap_operands: float = 0.0,
         weight_randomize: float = 0.00023,
         weight_simplify: float = 0.0020,
         weight_optimize: float = 0.0,
@@ -793,6 +797,7 @@ def __init__(
         self.weight_do_nothing = weight_do_nothing
         self.weight_mutate_constant = weight_mutate_constant
         self.weight_mutate_operator = weight_mutate_operator
+        self.weight_swap_operands = weight_swap_operands
         self.weight_randomize = weight_randomize
         self.weight_simplify = weight_simplify
         self.weight_optimize = weight_optimize
@@ -1609,6 +1614,7 @@ def _run(self, X, y, mutated_params, weights, seed):
         mutation_weights = SymbolicRegression.MutationWeights(
             mutate_constant=self.weight_mutate_constant,
             mutate_operator=self.weight_mutate_operator,
+            swap_operands=self.weight_swap_operands,
             add_node=self.weight_add_node,
             insert_node=self.weight_insert_node,
             delete_node=self.weight_delete_node,

pysr/version.py

@@ -1,2 +1,2 @@
-__version__ = "0.16.8"
-__symbolic_regression_jl_version__ = "0.23.0"
+__version__ = "0.16.9"
+__symbolic_regression_jl_version__ = "0.23.1"