Changeset 1146 for framspy/evolalg/examples/niching_novelty.py

Timestamp:

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

Author:

Maciej Komosinski

Message:

Cosmetic

File:

• framspy/evolalg/examples/niching_novelty.py (modified) (4 diffs)

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,