Merge pull request #45 from Gromwud/main

Store offsprings in history

Author: Gromwud

epde/operators/multiobjective/moeadd_specific.py

@@ -360,18 +360,22 @@ def apply(self, objective: ParetoLevels, arguments: dict):
                 self.suboperators['chromosome_fitness'].apply(objective=temp_offspring,
                                                               arguments=subop_args['chromosome_fitness'])
 
-                if all([not np.allclose(temp_offspring.obj_fun, solution.obj_fun) for solution in objective.population]):
+                if (all([not np.allclose(temp_offspring.obj_fun, solution.obj_fun) for solution in objective.population])
+                        and tuple(temp_offspring.obj_fun) not in objective.history):
+                        # and all([not np.allclose(temp_offspring.obj_fun, obj_fun) for obj_fun in objective.history]):
+
+                    self.suboperators['pareto_level_updater'].apply(objective=(temp_offspring, objective),
+                                                                    arguments=subop_args['pareto_level_updater'])
+                    objective.history.add(tuple(temp_offspring.obj_fun))
+                    break
+                elif replaced >= attempt_limit:
+                    print("Allowed replication")
                     self.suboperators['pareto_level_updater'].apply(objective=(temp_offspring, objective),
                                                                     arguments=subop_args['pareto_level_updater'])
                     break
-                # elif attempt >= attempt_limit and replaced:
-                #     print("Allowed replication")
-                #     self.suboperators['pareto_level_updater'].apply(objective=(temp_offspring, objective),
-                #                                                     arguments=subop_args['pareto_level_updater'])
-                #     break
                 elif attempt >= attempt_limit:
                     temp_offspring.create()
-                    replaced = True
+                    replaced += 1
                     attempt = 1
                 self.suboperators['chromosome_mutation'].apply(objective=temp_offspring,
                                                                arguments=subop_args['chromosome_mutation'])
@@ -430,6 +434,7 @@ def apply(self, objective : ParetoLevels, arguments : dict):
 
                 self.suboperators['chromosome_fitness'].apply(objective = objective.unplaced_candidates[idx],
                                                               arguments = subop_args['chromosome_fitness'])
+                objective.history.add(tuple(candidate.obj_fun))
             objective.initial_placing()
         return objective
 

epde/optimizers/moeadd/moeadd.py

@@ -67,6 +67,7 @@ def __init__(self, population, sorting_method = fast_non_dominated_sorting,
         self.population = []
         self._update_method = update_method
         self.unplaced_candidates = population
+        self.history = set()
 
     def manual_reconst(self, attribute:str, value, except_attrs:dict):
         from epde.loader import attrs_from_dict