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

Timestamp:

07/30/14 01:41:54 (10 years ago)

Author:

bburlacu

Message:

#1772: Worked towards integrating the new graph api with the tracking operators.

File:

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

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

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Analysis;
@@ -268 +269 @@
         #region add elite in the graph and connect it with the previous elite
         if (elite != null) {
-          var prevVertex = (IGenealogyGraphNode<T>)GenealogyGraph.GetVertex(elite);
+          var prevVertex = (IGenealogyGraphNode<T>)GenealogyGraph.GetByContent(elite);
           prevVertex.IsElite = true; // mark elites in the graph retroactively
 
           var clone = (T)elite.Clone();
 
-          var vertex = new GenealogyGraphNode<T>(prevVertex.Content) {
+          var v = new GenealogyGraphNode<T>(prevVertex.Content) {
             Rank = generation,
             Quality = prevVertex.Quality,
@@ -279 +280 @@
           };
 
-          prevVertex.Content = clone;
+          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()) {
+            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);
+          }
+          GenealogyGraph.RemoveVertex(prevVertex);
+          GenealogyGraph.AddVertex(w);
+          GenealogyGraph.AddVertex(v);
+          GenealogyGraph.AddArc(w, v); // connect current elite with previous elite
+
+          v.InArcs.Last().Data = data;
+          if (parents != null) {
+            foreach (var p in parents)
+              GenealogyGraph.AddArc(p, w);
+          }
+
           // inject the graph node unique id to the scope
-          ExecutionContext.Scope.SubScopes[index].Variables["Id"].Value = new StringValue(vertex.Id);
-          GenealogyGraph.AddVertex(vertex);
-          GenealogyGraph.AddArc(prevVertex, vertex); // connect current elite with previous elite
-
-          if (prevVertex.InArcs.Any()) {
-            vertex.InArcs.Last().Data = prevVertex.InArcs.Last().Data; // save the fragment in case there is one
-          }
+          ExecutionContext.Scope.SubScopes[index].Variables["Id"].Value = new StringValue(v.Id);
         }
         #endregion
@@ -295 +316 @@
       // update qualities
       for (int i = 0; i < population.Length; ++i) {
-        var vertex = (IGenealogyGraphNode)GenealogyGraph.GetVertex(population[i]);
+        var vertex = (IGenealogyGraphNode)GenealogyGraph.GetByContent(population[i]);
         vertex.Quality = qualities[i].Value;
       }
@@ -301 +322 @@
       // 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();
-      foreach (var vertex in discardedOffspring.Select(individual => GenealogyGraph.GetVertex(individual))) {
+      foreach (var vertex in discardedOffspring.Select(individual => GenealogyGraph.GetByContent(individual))) {
         GenealogyGraph.RemoveVertex(vertex);
       }
@@ -313 +334 @@
       // compute the weight of each genealogy graph node as the ratio (produced offspring) / (surviving offspring)
       foreach (var ind in population) {
-        var v = (IGenealogyGraphNode)GenealogyGraph.GetVertex(ind);
+        var v = (IGenealogyGraphNode)GenealogyGraph.GetByContent(ind);
         foreach (var p in v.Parents)
           p.Weight++;