Changeset 1139 for framspy/evolalg/fitness

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/fitness

Files:

• fitness_step.py (modified) (2 diffs)
• multiple_evaluations.py (modified) (1 diff)

framspy/evolalg/fitness/fitness_step.py

@@ -8 +8 @@
 class FitnessStep(FramsStep):
     def __init__(self, frams_lib, fields: Dict, fields_defaults: Dict, commands: List[str] = None,
-                 vectorized: bool = True, evaluation_count=None):
+                 vectorized: bool = True, evaluation_count=None, *args, **kwargs):
 
-        super().__init__(frams_lib, commands)
+        super().__init__(frams_lib, commands, *args, **kwargs)
         self.fields = fields
         self.fields_defaults = fields_defaults
@@ -28 +28 @@
 
     def call(self, population: List[Individual]):
+        super(FitnessStep, self).call(population)
         if self.vectorized:
             data = self.frams.evaluate([_.genotype for _ in population])

framspy/evolalg/fitness/multiple_evaluations.py

@@ -7 +7 @@
 class MultipleEvaluationFitness(FitnessStep):
     def __init__(self, frams_lib, fields: Dict, fields_defaults: Dict, commands: List[str] = None,
-                 vectorized: bool = True, number_evaluations = 10):
-        super().__init__(frams_lib, fields, fields_defaults, commands, vectorized)
+                 vectorized: bool = True, number_evaluations = 10, *args, **kwargs):
+        super().__init__(frams_lib, fields, fields_defaults, commands, vectorized, *args, **kwargs)
         self.number_evaluations = number_evaluations
 
 
     def call(self, population: List[Individual]):
+        super(MultipleEvaluationFitness, self).call(population)
         pop = copy.deepcopy(population)
         statistics = [{} for _ in range(len(population))]