Changeset 1139 for framspy/evolalg/mutation_cross

Timestamp:

05/08/21 12:42:58 (4 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

Location:

framspy/evolalg/mutation_cross

Files:

• frams_cross.py (modified) (1 diff)
• frams_cross_and_mutate.py (modified) (2 diffs)
• frams_cross_or_mutate.py (modified) (4 diffs)
• frams_mutation.py (modified) (1 diff)

framspy/evolalg/mutation_cross/frams_cross.py

@@ -6 +6 @@
 
 class FramsCross(FramsStep):
-    def __init__(self, frams_lib, commands, cross_prob):
-        super().__init__(frams_lib, commands)
+    def __init__(self, frams_lib, commands, cross_prob, *args, **kwargs):
+        super().__init__(frams_lib, commands, *args, **kwargs)
         self.cross_prob = cross_prob
 
     def call(self, population):
+        super(FramsCross, self).call(population)
         for i in range(1, len(population), 2):
             if random.random() < self.cross_prob:

framspy/evolalg/mutation_cross/frams_cross_and_mutate.py

@@ -5 +5 @@
 
 class FramsCrossAndMutate(FramsStep):
-    def __init__(self, frams_lib, cross_prob, mutate_prob, mutate_commands=None, cross_commands=None):
-        super().__init__(frams_lib)
+    def __init__(self, frams_lib, cross_prob, mutate_prob, mutate_commands=None, cross_commands=None, *args, **kwargs):
+        super().__init__(frams_lib, *args, **kwargs)
 
         self.cross_prob = cross_prob
@@ -15 +15 @@
 
     def call(self, population):
+        super(FramsCrossAndMutate, self).call(population)
         population = self.frams_cross(population)
         population = self.frams_mutate(population)

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
 

framspy/evolalg/mutation_cross/frams_mutation.py

@@ -6 +6 @@
 
 class FramsMutation(FramsStep):
-    def __init__(self, frams_lib, commands, mutate_prob):
-        super().__init__(frams_lib, commands)
+    def __init__(self, frams_lib, commands, mutate_prob, *args, **kwargs):
+        super().__init__(frams_lib, commands, *args, **kwargs)
         self.mutate_prob = mutate_prob
 
     def call(self, population):
+        super(FramsMutation, self).call(population)
         idx = []
         for i in range(len(population)):