Changeset 12892 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking

Timestamp:

08/23/15 13:21:12 (9 years ago)

Author:

bburlacu

Message:

#1772: Made GenealogyAnalyzer class abstract and added abstract method EvaluateIntermediateChildren in order to assign qualities to intermediate vertices in the genealogy graph. Implemented SymbolicDataAnalysisGeneticOperatorImprovementAnalyzer which shows parent-child quality statistics for crossover and mutation.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs (modified) (8 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -34 +33 @@
   [StorableClass]
   [Item("GenealogyAnalyzer", "An analyzer which performs the necessary instrumentation to record the evolution of a genetic algorithm.")]
-  public class GenealogyAnalyzer<T> : SingleSuccessorOperator, IAnalyzer
+  public abstract class GenealogyAnalyzer<T> : SingleSuccessorOperator, IAnalyzer
   where T : class, IItem {
     #region parameter names
@@ -146 +145 @@
     #endregion properties
 
-    public GenealogyAnalyzer() {
+    protected GenealogyAnalyzer() {
       #region add parameters
       // the instrumented operators
@@ -166 +165 @@
       Parameters.Add(new ValueParameter<IManipulatorOperator<T>>(AfterManipulatorOperatorParameterName));
       #endregion add parameters
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new GenealogyAnalyzer<T>(this, cloner);
     }
 
@@ -246 +241 @@
     }
 
+    protected abstract void EvaluateIntermediateChildren();
+
     public override IOperation Apply() {
       IGenealogyGraph<T> genealogyGraph;
@@ -273 +270 @@
         int index = 0;
         T elite = null;
-
+        // identify previous elite individual
         for (int i = 0; i < population.Length; ++i) {
           if (genealogyGraph.GetByContent(population[i]).Rank.Equals(generation - 1)) {
@@ -281 +278 @@
           }
         }
-
+        // add current elite and connect with previous
         #region add elite in the graph and connect it with the previous elite
         if (elite != null) {
@@ -303 +300 @@
         vertex.Quality = qualities[i].Value;
       }
+      // update qualities for intermediate vertices
+      EvaluateIntermediateChildren();
+
       // remove extra graph nodes (added by the instrumented operators in the case of offspring selection)
       var pop = new HashSet<T>(population);