Changeset 11390 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs

Timestamp:

09/25/14 17:14:51 (10 years ago)

Author:

bburlacu

Message:

#1772: Simplified code in the GenealogyAnalyzer and removed useless property in BeforeCrossoverOperator.cs. Small cosmetic changes in GenealogyAnalyzer.cs and IGenealogyGraph.cs.

File:

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

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

@@ -20 +20 @@
 #endregion
 
-using System;
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Analysis;
@@ -125 +125 @@
     public BoolValue EnableSolutionCreatorTracking {
       get { return EnableSolutionCreatorTrackingParameter.Value; }
-    }
-
-    public IGenealogyGraph<T> GenealogyGraph {
-      get {
-        IResult result;
-        var results = ResultsParameter.ActualValue;
-        if (!results.ContainsKey(PopulationGraphParameterName)) {
-          result = new Result(PopulationGraphParameterName, new GenealogyGraph<T>());
-          results.Add(result);
-        } else {
-          result = results[PopulationGraphParameterName];
-        }
-        var graph = (IGenealogyGraph<T>)result.Value;
-        return graph;
-      }
     }
     #endregion
@@ -242 +227 @@
 
     public override IOperation Apply() {
+      IGenealogyGraph<T> genealogyGraph;
+      var results = ResultsParameter.ActualValue;
+      if (!results.ContainsKey(PopulationGraphParameterName)) {
+        genealogyGraph = new GenealogyGraph<T>();
+        results.Add(new Result(PopulationGraphParameterName, genealogyGraph));
+      } else {
+        genealogyGraph = (IGenealogyGraph<T>)results[PopulationGraphParameterName].Value;
+      }
+
       var population = PopulationParameter.ActualValue;
       var qualities = QualityParameter.ActualValue.ToList();
@@ -252 +246 @@
           var individual = population[i];
           var vertex = new GenealogyGraphNode<T>(individual) { Rank = generation };
-          GenealogyGraph.AddVertex(vertex);
+          genealogyGraph.AddVertex(vertex);
           // save the vertex id in the individual scope (so that we can identify graph indices)
           ExecutionContext.Scope.SubScopes[i].Variables.Add(new Variable("Id", new StringValue(vertex.Id)));
@@ -261 +255 @@
 
         for (int i = 0; i < population.Length; ++i) {
-          if (GenealogyGraph.GetByContent(population[i]).Rank.Equals(generation - 1)) {
+          if (genealogyGraph.GetByContent(population[i]).Rank.Equals(generation - 1)) {
             elite = population[i];
             index = i;
@@ -270 +264 @@
         #region add elite in the graph and connect it with the previous elite
         if (elite != null) {
-          var prevVertex = (IGenealogyGraphNode<T>)GenealogyGraph.GetByContent(elite);
+          var prevVertex = genealogyGraph.GetByContent(elite);
           prevVertex.IsElite = true; // mark elites in the graph retroactively
-          var v = new GenealogyGraphNode<T>((IDeepCloneable)prevVertex.Data.Clone()) {
-            Rank = generation,
-            Quality = prevVertex.Quality,
-            IsElite = false
-          };
-          GenealogyGraph.AddVertex(v);
-          GenealogyGraph.AddArc(prevVertex, v);
-
+          var v = (IGenealogyGraphNode<T>)prevVertex.Clone();
+          v.Rank = generation;
+          v.IsElite = false;
+          population[index] = v.Data;
+          genealogyGraph.AddVertex(v);
+          genealogyGraph.AddArc(prevVertex, v);
           // inject the graph node unique id to the scope
           ExecutionContext.Scope.SubScopes[index].Variables[BeforeManipulatorOperator.ChildParameter.ActualName].Value = v.Data;
@@ -286 +278 @@
         #endregion
 
-        ComputeSuccessRatios();
+        ComputeSuccessRatios(genealogyGraph);
       }
       // update qualities
       for (int i = 0; i < population.Length; ++i) {
-        var vertex = GenealogyGraph.GetByContent(population[i]);
+        var vertex = genealogyGraph.GetByContent(population[i]);
         vertex.Quality = qualities[i].Value;
       }
 
       // remove extra graph nodes (added by the instrumented operators in the case of offspring selection)
-      RemoveUnsuccessfulOffspring();
+      var pop = new HashSet<T>(population);
+      var discarded = genealogyGraph.Ranks[generation].Where(x => !pop.Contains(x.Data)).ToList();
+      for (int i = 0; i < discarded.Count; ++i) {
+        var v = discarded[i];
+        if (v.InDegree == 1) {
+          var p = v.Parents.First();
+          if (p.Rank.Equals(generation - 0.5))
+            // the individual was a product of mutation. since it wasn't selected, we must remove both it and it's parent 
+            // ("intermediate" vertex result of crossover)
+            discarded.Add(v.Parents.First());
+        }
+      }
+      genealogyGraph.RemoveVertices(discarded);
+      //RemoveUnsuccessfulOffspring();
 
       return base.Apply();
-    }
-
-    private void RemoveUnsuccessfulOffspring() {
-      int generation = GenerationsParameter.ActualValue.Value;
-      var population = PopulationParameter.ActualValue;
-      var discardedOffspring = GenealogyGraph.Ranks[generation].Select(x => (T)x.Data).Except(population).ToList();
-      foreach (var vertex in discardedOffspring.Select(individual => GenealogyGraph.GetByContent(individual))) {
-        if (vertex.InDegree == 1) {
-          var p = vertex.Parents.First();
-          if (!p.Rank.Equals(generation - 0.5))
-            throw new InvalidOperationException("Parent must be an intermediate vertex");
-          GenealogyGraph.RemoveVertex(p);
-        }
-        GenealogyGraph.RemoveVertex(vertex);
-      }
     }
 
     // this method works when called before the unsuccesful offspring are removed from the genealogy graph
     // so it must always be called before RemoveUnsuccessfulOffspring()
-    private void ComputeSuccessRatios() {
+    private void ComputeSuccessRatios(IGenealogyGraph<T> genealogyGraph) {
       const string successfulOffspringRatioTableHistoryName = "Successful offspring ratios history";
       const string successfulOffspringAbsoluteValuesTableHistoryName = "Successful offspring values history";
@@ -327 +317 @@
       // compute the weight of each genealogy graph node as the ratio (produced offspring) / (surviving offspring)
       foreach (var ind in population) {
-        var v = GenealogyGraph.GetByContent(ind);
+        var v = genealogyGraph.GetByContent(ind);
         if (v.Parents.Count() == 1) {
           var p = v.Parents.First();
@@ -356 +346 @@
         VisualProperties = { ChartType = DataRowVisualProperties.DataRowChartType.Columns, StartIndexZero = true }
       };
-      successfulOffspringRatioRow.Values.Replace(GenealogyGraph.Ranks[generation - 1].OrderByDescending(x => x.Quality).Select(x => x.OutDegree > 0 ? x.Weight / x.OutDegree : 0));
+      successfulOffspringRatioRow.Values.Replace(genealogyGraph.Ranks[generation - 1].OrderByDescending(x => x.Quality).Select(x => x.OutDegree > 0 ? x.Weight / x.OutDegree : 0));
       successfulOffspringRatioTable.Rows.Add(successfulOffspringRatioRow);
       successfulOffspringRatioHistory.Add(successfulOffspringRatioTable);
@@ -379 +369 @@
         VisualProperties = { ChartType = DataRowVisualProperties.DataRowChartType.Columns, StartIndexZero = true }
       };
-      successfulOffspringValuesRow.Values.Replace(GenealogyGraph.Ranks[generation - 1].OrderByDescending(x => x.Quality).Select(x => x.Weight));
+      successfulOffspringValuesRow.Values.Replace(genealogyGraph.Ranks[generation - 1].OrderByDescending(x => x.Quality).Select(x => x.Weight));
       successfulOffspringValuesTable.Rows.Add(successfulOffspringValuesRow);
       successfulOffspringAbsoluteHistory.Add(successfulOffspringValuesTable);