Changeset 1146 for framspy/evolalg

Timestamp:

08/03/21 14:00:12 (3 years ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Location:

framspy/evolalg

Files:

• base/union_step.py (modified) (1 diff)
• examples/niching_novelty.py (modified) (4 diffs)
• examples/standard.py (modified) (2 diffs)
• statistics/statistics_deap.py (modified) (1 diff)

framspy/evolalg/base/union_step.py

@@ -12 +12 @@
             self.steps = [steps]
 
+    def init(self):
+        for s in self.steps:
+            if isinstance(s, Step):
+                s.init()
+
     def call(self, population):
         super(UnionStep, self).call(population)

framspy/evolalg/examples/niching_novelty.py

@@ -141 +141 @@
 
 
+def func_raw(ind): setattr(ind, "fitness", ind.fitness_raw)
+
+
+def func_novelty(ind): setattr(ind, "fitness", ind.dissim)
+
+
+def func_knn_novelty(ind): setattr(ind, "fitness", ind.dissim)
+
+
 def func_niching(ind): setattr(ind, "fitness", ind.fitness_raw * (1 + ind.dissim))
-
-
-def func_raw(ind): setattr(ind, "fitness", ind.fitness_raw)
-
-
-def func_novelty(ind): setattr(ind, "fitness", ind.dissim)
-
-
-def func_knn_novelty(ind): setattr(ind, "fitness", ind.dissim)
 
 
@@ -180 +180 @@
     new_generation_stages = [FramsCrossAndMutate(frams_lib, cross_prob=0.2, mutate_prob=0.9)]
 
-    # Steps after new population is created. Executed exacly once per generation.
+    # Steps after new population is created. Executed exactly once per generation.
     generation_modifications = []
 
@@ -245 +245 @@
         generation_modifications.append(raw)
 
-    if parsed_args.fit == Fitness.niching:
+    if parsed_args.fit == Fitness.niching: # TODO reduce redundancy in the four cases below: dictionary?
         niching = UnionStep([
             dissim,
@@ -297 +297 @@
 
     # -------------------------------------------------
-    # End stages: this will execute exacly once after all generations.
+    # End stages: this will execute exactly once after all generations.
     end_stages = [
         replace_with_hof,

framspy/evolalg/examples/standard.py

@@ -8 +8 @@
 # TODO add comments to all examples in this directory
 # TODO add to standard.py and steadystate.py evaluating each genotype in HOF N (configurable, default 20) times when the evolution ends, as it is in niching_novelty.py
-# TODO "--debug" mode, indent nested steps (pre++, post-- of a static counter?) and print their arguments so it is easy to see what happens during evolution
+# TODO "-debug" mode, indent nested steps (pre++, post-- of a static counter?) and print their arguments so it is easy to see what happens during evolution
 
 
@@ -80 +80 @@
     ])
 
-    fitness_remove = UnionStep(
+    fitness_remove = UnionStep(  # evaluate performance and fitness, rename some of the fields, and remove some performance fields that we get from Framsticks, but we don't need them here
         [
         FitnessStep(frams_lib, fields={"velocity": "fitness", "data->recording": "recording"},
                     fields_defaults={"velocity": None, "data->recording": None})  # custom definitions and handling
         if EVAL_LIFESPAN_BEHAVIOR else
-        FitnessStep(frams_lib, fields={parsed_args.opt: "fitness", }, fields_defaults={parsed_args.opt: None})
+        FitnessStep(frams_lib, fields={parsed_args.opt: "fitness"}, fields_defaults={parsed_args.opt: None})
         ]
         +

framspy/evolalg/statistics/statistics_deap.py

@@ -26 +26 @@
         if self.verbose:
             print(self.logbook.stream)
+
+    def compile(self, data):
+        return self.stats.compile(data)
+
+