Minor changes and fixes: mutation + lr criterion

Author: Maslyaev

epde/operators/common/fitness.py

@@ -200,7 +200,7 @@ def apply(self, objective: Equation, arguments: dict, force_out_of_place: bool =
                 for start_idx in range(0, num_horizons, step_size):
                     end_idx = start_idx + window_size
                     target_window = target_vals[start_idx:end_idx]
-                    if np.isclose(np.sqrt(np.mean(np.power(_, 2))), 0, atol=1e-10):
+                    if np.isclose(np.sqrt(np.mean(np.power(target_window, 2))), 0, atol=1e-10):
                         window_stability = np.abs(np.std(target_window))
                     else:
                         window_stability = np.abs(np.std(target_window) / np.sqrt(np.mean(np.power(target_window, 2))))
@@ -241,7 +241,7 @@ def apply(self, objective: Equation, arguments: dict, force_out_of_place: bool =
                             target_window = target_vals[start_idx:end_idx, :].reshape(-1)
                         else:
                             target_window = target_vals[:, start_idx:end_idx].reshape(-1)
-                        if np.isclose(np.sqrt(np.mean(np.power(_, 2))), 0, atol=1e-10):
+                        if np.isclose(np.sqrt(np.mean(np.power(target_window, 2))), 0, atol=1e-10):
                             window_stability = np.abs(np.std(target_window))
                         else:
                             window_stability = np.abs(np.std(target_window) / np.sqrt(np.mean(np.power(target_window, 2))))
@@ -285,7 +285,7 @@ def apply(self, objective: Equation, arguments: dict, force_out_of_place: bool =
                             target_window = target_vals[:, start_idx:end_idx, :].reshape(-1)
                         else:
                             target_window = target_vals[:, :, start_idx:end_idx].reshape(-1)
-                        if np.isclose(np.sqrt(np.mean(np.power(_, 2))), 0, atol=1e-10):
+                        if np.isclose(np.sqrt(np.mean(np.power(target_window, 2))), 0, atol=1e-10):
                             window_stability = np.abs(np.std(target_window))
                         else:
                             window_stability = np.abs(np.std(target_window) / np.sqrt(np.mean(np.power(target_window, 2))))

epde/operators/multiobjective/mutations.py

@@ -30,7 +30,7 @@ def apply(self, objective : SoEq, arguments : dict): # TODO: add setter for best
         altered_objective = deepcopy(objective)
 
         eqs_keys = altered_objective.vals.equation_keys; params_keys = altered_objective.vals.params_keys
-        affected_by_mutation = True
+        affected_by_mutation = np.random.random() < self.params['indiv_mutation_prob']
 
         if affected_by_mutation:
             for eq_key in eqs_keys:
@@ -56,7 +56,7 @@ class EquationMutation(CompoundOperator):
     key = 'EquationMutation'
     @HistoryExtender(f'\n -> mutating equation', 'ba')
     def apply(self, objective : Equation, arguments : dict):
-        self_args, subop_args = self.parse_suboperator_args(arguments = arguments)  
+        self_args, subop_args = self.parse_suboperator_args(arguments = arguments)
 
         for term_idx in range(objective.n_immutable, len(objective.structure)):
             if np.random.uniform(0, 1) <= self.params['r_mutation']:
@@ -213,7 +213,8 @@ def get_basic_mutation(mutation_params):
     metaparameter_mutation = MetaparameterMutation(['std', 'mean'])
     add_kwarg_to_operator(operator = metaparameter_mutation)
 
-    chromosome_mutation = SystemMutation([])
+    chromosome_mutation = SystemMutation(['indiv_mutation_prob'])
+    add_kwarg_to_operator(operator = chromosome_mutation)
 
     equation_mutation.set_suboperators(operators = {'mutation' : term_mutation})#, [term_param_mutation, ]
                                        # probas = {'equation_crossover' : [0.0, 1.0]})

epde/operators/singleobjective/mutations.py

@@ -221,6 +221,7 @@ def get_multiobjective_mutation(mutation_params): # TODO: rename function calls
     add_kwarg_to_operator(operator = metaparameter_mutation)
 
     chromosome_mutation = SystemMutation(['indiv_mutation_prob'])
+    add_kwarg_to_operator(operator = chromosome_mutation)
 
     equation_mutation.set_suboperators(operators = {'mutation' : term_mutation})
 
@@ -239,7 +240,8 @@ def get_singleobjective_mutation(mutation_params):
     add_kwarg_to_operator(operator = equation_mutation)
 
     chromosome_mutation = SystemMutation(['indiv_mutation_prob'])
-    
+    add_kwarg_to_operator(operator = chromosome_mutation)
+
     equation_mutation.set_suboperators(operators = {'mutation' : term_mutation})
 
     chromosome_mutation.set_suboperators(operators = {'equation_mutation' : equation_mutation})

epde/operators/utils/parameters/default_parameters_multi_objective.json

@@ -51,8 +51,8 @@
         "term_param_proportion" : 0.4
 	},
 	"SystemMutation" : {
-
-    	},
+		"indiv_mutation_prob" : 0.7
+    },
 	"EquationMutation" : {
         "r_mutation" : 0.6
 	},

epde/operators/utils/parameters/default_parameters_single_objective.json

@@ -33,7 +33,7 @@
         "term_param_proportion" : 0.4
 	},
     "SystemMutation" : {
-
+		"indiv_mutation_prob" : 0.7
     },
 	"EquationMutation" : {
         "r_mutation" : 0.6