Changeset 1139 for framspy/evolalg/mutation_cross/frams_cross_or_mutate.py

Timestamp:

05/08/21 12:42:58 (2 years ago)

Author:

Maciej Komosinski

Message:

Added --debug mode that prints names of steps; final multiple evaluation now evaluates genotypes in hall of fame instead of the last population

File:

• framspy/evolalg/mutation_cross/frams_cross_or_mutate.py (modified) (4 diffs)

framspy/evolalg/mutation_cross/frams_cross_or_mutate.py

@@ -4 +4 @@
 import random
 
+
 class FramsCrossOrMutate(FramsStep):
-    def __init__(self, frams_lib, commands, cross_prob, mutate_prob, mutate_commands=None, cross_commands=None):
-        super().__init__(frams_lib, commands)
+    def __init__(self, frams_lib, commands, cross_prob, mutate_prob, mutate_commands=None, cross_commands=None, *args,
+                 **kwargs):
+        super().__init__(frams_lib, commands, *args, **kwargs)
 
         self.cross_prob = cross_prob
@@ -15 +17 @@
 
     def call(self, population):
+        super(FramsCrossOrMutate, self).call(population)
         mutate_idx = []
         cross_idx = []
@@ -21 +24 @@
             if rng < self.cross_prob:
                 cross_idx.append(i)
-            elif rng < self.cross_prob+self.mutate_prob:
+            elif rng < self.cross_prob + self.mutate_prob:
                 mutate_idx.append(i)
 
@@ -32 +35 @@
             self.frams_cross(cross_idx)
 
-        for i,ind in zip(mutate_idx, mutate_ind):
+        for i, ind in zip(mutate_idx, mutate_ind):
             population[i] = ind
 
-        for i,ind in zip(cross_idx, cross_ind):
+        for i, ind in zip(cross_idx, cross_ind):
             population[i] = ind