Update to check whether individual is in evaluated individuals

Update to check whether the individual is in evaluated individuals instead of checking whether the individual is the same as parents.
EpistasisLab · Jul 29, 2022 · 9e6ad7e · 9e6ad7e
1 parent 44faaf2
commit 9e6ad7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tpot/base.py b/tpot/base.py
@@ -1812,7 +1812,7 @@ def _mate_operator(self, ind1, ind2):
                 offspring.statistics["generation"] = "INVALID"
                 break
 
-        return offspring, offspring2
+        return offspring, offspring2, self.evaluated_individuals_
 
     @_pre_test
     def _random_mutation_operator(self, individual, allow_shrink=True):

diff --git a/tpot/gp_deap.py b/tpot/gp_deap.py
@@ -131,10 +131,10 @@ def varOr(population, toolbox, lambda_, cxpb, mutpb):
         if op_choice < cxpb:  # Apply crossover
             ind1, ind2 = pick_two_individuals_eligible_for_crossover(population)
             if ind1 is not None:
-                ind1, _ = toolbox.mate(ind1, ind2)
+                ind1_cx, _, evaluated_individuals_= toolbox.mate(ind1, ind2)
                 del ind1.fitness.values
 
-                if str(ind1_cx) == str(ind1) or str(ind1_cx) == str(ind2):
+                if str(ind1_cx) in evaluated_individuals_:
                     ind1_cx = mutate_random_individual(population, toolbox)
                 offspring.append(ind1_cx)
             else: