Changeset 1139 for framspy/evolalg/repair

Timestamp:

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

Files:

• const.py (modified) (1 diff)
• halloffame_repair.py (modified) (1 diff)
• multistep.py (modified) (1 diff)
• mutate.py (modified) (1 diff)
• remove/field.py (modified) (1 diff)
• remove/function.py (modified) (1 diff)
• remove/remove.py (modified) (2 diffs)
• repair.py (modified) (2 diffs)

framspy/evolalg/repair/const.py

@@ -5 +5 @@
 
 class ConstRepair(Repair):
-    def __init__(self, value, excepted_size):
-        super(ConstRepair, self).__init__(excepted_size)
+    def __init__(self, value, excepted_size, *args, **kwargs):
+        super(ConstRepair, self).__init__(excepted_size, *args, **kwargs)
         self.value = value
 

framspy/evolalg/repair/halloffame_repair.py

@@ -6 +6 @@
 
 class HallOfFameRepair(Repair):
-    def __init__(self, excepted_size, halloffame, top):
-        super(HallOfFameRepair, self).__init__(excepted_size)
+    def __init__(self, excepted_size, halloffame, top, *args, **kwargs):
+        super(HallOfFameRepair, self).__init__(excepted_size, *args, **kwargs)
         self.halloffame = halloffame
         self.top = top

framspy/evolalg/repair/multistep.py

@@ -3 +3 @@
 
 class MultistepRepair(Repair):
-    def __init__(self, selection, steps, excepted_size):
-        super(MultistepRepair, self).__init__(excepted_size)
+    def __init__(self, selection, steps, excepted_size, *args, **kwargs):
+        super(MultistepRepair, self).__init__(excepted_size, *args, **kwargs)
         self.selection = selection
         self.steps = steps

framspy/evolalg/repair/mutate.py

@@ -6 +6 @@
 
 class MutateRepair(Repair):
-    def __init__(self, mutate_step, excepted_size, iterations=1):
-        super(MutateRepair, self).__init__(excepted_size)
+    def __init__(self, mutate_step, excepted_size, iterations=1, *args, **kwargs):
+        super(MutateRepair, self).__init__(excepted_size, *args, **kwargs)
         self.mutate_step = mutate_step
         self.iterations = iterations

framspy/evolalg/repair/remove/field.py

@@ -3 +3 @@
 
 class FieldRemove(Remove):
-    def __init__(self, field_name, field_value):
-        super(FieldRemove, self).__init__()
+    def __init__(self, field_name, field_value, *args, **kwargs):
+        super(FieldRemove, self).__init__(*args, **kwargs)
         self.field_name = field_name
         self.field_value = field_value

framspy/evolalg/repair/remove/function.py

@@ -3 +3 @@
 from evolalg.repair.remove.remove import Remove
 class LambdaRemove(Remove):
-    def __init__(self, func):
-        super(LambdaRemove, self).__init__()
+    def __init__(self, func, *args, **kwargs):
+        super(LambdaRemove, self).__init__(*args, **kwargs)
         self.func = func
 

framspy/evolalg/repair/remove/remove.py

@@ -5 +5 @@
 
 class Remove(Step):
-    def __init__(self):
+    def __init__(self, *args, **kwargs):
+        super(Remove, self).__init__(*args , **kwargs)
         pass
 
@@ -13 +14 @@
 
     def call(self, population):
+        super(Remove, self).call(population)
         return [_ for _ in population if not self.remove(_)]

framspy/evolalg/repair/repair.py

@@ -6 +6 @@
 
 class Repair(Step):
-    def __init__(self, excepted_size):
+    def __init__(self, excepted_size, *args, **kwargs):
+        super(Repair, self).__init__(*args, **kwargs)
         self.excepted_size = excepted_size
 
@@ -14 +15 @@
 
     def call(self, population):
+        super(Repair, self).call(population)
         generated = []
         while len(generated) + len(population) < self.excepted_size: