Changeset 13527 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers

Timestamp:

01/16/16 15:39:03 (9 years ago)

Author:

bburlacu

Message:

#1772: Fixed the way operator improvement is calculated so it also works when a diversification strategy is applied (introducing multiple intermediate vertices between parent and child). Minor code refactoring in the diversification operators. Fixed very small typo in the BeforeManipulatorOperator.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisGeneticOperatorImprovementAnalyzer.cs (modified) (4 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisGeneticOperatorImprovementAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Analysis;
@@ -103 +104 @@
       var populationSize = population.Length;
 
-      var vertices = population.Select(graph.GetByContent).ToList();
+      //      var vertices = population.Select(graph.GetByContent).ToList();
+      var crossoverChildren = new List<IGenealogyGraphNode<ISymbolicExpressionTree>>();
+      var mutationChildren = new List<IGenealogyGraphNode<ISymbolicExpressionTree>>();
+      var vertices = graph.Vertices.Where(x => x.Rank > generation - 1);
+      foreach (var v in vertices) {
+        if (v.InDegree == 2) {
+          crossoverChildren.Add(v);
+        } else {
+          var parent = v.Parents.First();
+          // mutation is always preceded by mutation
+          // so the parent vertex should have an intermediate rank
+          // otherwise, it is the previos generation elite
+          if (parent.Rank.IsAlmost(generation - 1) && parent.IsElite)
+            continue;
+          mutationChildren.Add(v);
+        }
+      }
       DataTable table;
       #region crossover improvement
@@ -118 +135 @@
         table = (DataTable)Results["Crossover improvement"].Value;
       }
-      var crossoverChildren = vertices.Where(x => x.InDegree == 2).ToList();
-      if (CountIntermediateChildren)
-        crossoverChildren.AddRange(vertices.Where(x => x.InDegree == 1).Select(v => v.Parents.First()).Where(p => p.Rank.IsAlmost(generation - 0.5))); // add intermediate children
 
       var avgCrossoverParentQuality = crossoverChildren.SelectMany(x => x.Parents).Average(x => x.Quality);
@@ -148 +162 @@
       }
 
-      var mutationChildren = vertices.Where(x => x.InDegree == 1).ToList();
-
       var avgMutationParentQuality = mutationChildren.SelectMany(x => x.Parents).Average(x => x.Quality);
       var avgMutationChildQuality = mutationChildren.Average(x => x.Quality);