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

Timestamp:

07/31/14 17:11:39 (10 years ago)

Author:

bburlacu

Message:

#1772: Ported the rest of the changes to the DirectedGraph and Vertex to the GenealogyGraph and GenealogyGraphNode. Adapted tracking operators, analyzers and views.

File:

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

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

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
+using System;
 using System.Linq;
 using HeuristicLab.Analysis;
@@ -259 +259 @@
         int index = 0;
         T elite = null;
+
+        int psum1 = GenealogyGraph.Ranks[generation].Sum(x => x.Parents.Count());
+
         for (int i = 0; i < population.Length; ++i) {
-          if (GenealogyGraph.Contains(population[i])) {
+          if (GenealogyGraph.GetByContent(population[i]).Rank.Equals(generation - 1)) {
             elite = population[i];
             index = i;
@@ -271 +274 @@
           var prevVertex = (IGenealogyGraphNode<T>)GenealogyGraph.GetByContent(elite);
           prevVertex.IsElite = true; // mark elites in the graph retroactively
-
-          var clone = (T)elite.Clone();
-
-          var v = new GenealogyGraphNode<T>(prevVertex.Content) {
+          var w = new GenealogyGraphNode<T>(prevVertex); //shallow copy, arcs are not copied
+          var v = new GenealogyGraphNode<T>(prevVertex.Data) {
             Rank = generation,
             Quality = prevVertex.Quality,
@@ -280 +281 @@
           };
 
-          var w = new GenealogyGraphNode<T>(clone) {
-            Rank = generation - 1,
-            Quality = prevVertex.Quality,
-            IsElite = true
-          };
-
-          // replace previous elite with vertex w 
-          List<IGenealogyGraphNode<T>> parents = null;
           object data = null;
-          if (prevVertex.InArcs.Any()) {
+          if (prevVertex.InArcs.Any())
             data = prevVertex.InArcs.Last().Data;
-            parents = prevVertex.InArcs.Select(x => (IGenealogyGraphNode<T>)x.Source).ToList();
-            //            v.InArcs.Last().Data = prevVertex.InArcs.Last().Data; // save the fragment in case there is one
-            //            var p = prevVertex.InArcs.First().Source;
-            //            GenealogyGraph.AddArc(p, w);
-          }
+          var children = prevVertex.Children.ToList();
+          var parents = prevVertex.Parents.ToList();
+
           GenealogyGraph.RemoveVertex(prevVertex);
           GenealogyGraph.AddVertex(w);
@@ -301 +292 @@
           GenealogyGraph.AddArc(w, v); // connect current elite with previous elite
 
+          // recreate connections after prevVertex was replaced with w
+          foreach (var c in children) GenealogyGraph.AddArc(w, c);
+          foreach (var p in parents) GenealogyGraph.AddArc(p, w);
+
           v.InArcs.Last().Data = data;
-          if (parents != null) {
-            foreach (var p in parents)
-              GenealogyGraph.AddArc(p, w);
-          }
+
+          if (w.InArcs.Any())
+            w.InArcs.Last().Data = data;
 
           // inject the graph node unique id to the scope
@@ -311 +305 @@
         }
         #endregion
+        int psum2 = GenealogyGraph.Ranks[generation].Sum(x => x.Parents.Count());
+
+        if (psum1 != psum2 - 1) // -1 because we have added an additional arc from the previous elite to the current one
+          throw new InvalidOperationException("Parent sum should remain the same.");
 
         ComputeSuccessRatios();
@@ -316 +314 @@
       // update qualities
       for (int i = 0; i < population.Length; ++i) {
-        var vertex = (IGenealogyGraphNode)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)
-      var discardedOffspring = GenealogyGraph.Ranks[generation].Select(x => (T)x.Content).Except(population).ToList();
+      var discardedOffspring = GenealogyGraph.Ranks[generation].Select(x => (T)x.Data).Except(population).ToList();
       foreach (var vertex in discardedOffspring.Select(individual => GenealogyGraph.GetByContent(individual))) {
         GenealogyGraph.RemoveVertex(vertex);
@@ -334 +332 @@
       // compute the weight of each genealogy graph node as the ratio (produced offspring) / (surviving offspring)
       foreach (var ind in population) {
-        var v = (IGenealogyGraphNode)GenealogyGraph.GetByContent(ind);
+        var v = GenealogyGraph.GetByContent(ind);
         foreach (var p in v.Parents)
           p.Weight++;