Changeset 11318 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking

Timestamp:

08/31/14 18:28:25 (10 years ago)

Author:

bburlacu

Message:

#1772: Fixed bug and improved handling of elite individuals in the genealogy analyzer. Fixed minor bug in the tracing code. Other minor cosmetic improvements to the GenealogyGraph and FragmentGraphView.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4

Files:

• Analyzers/GenealogyAnalyzer.cs (modified) (1 diff)
• GenealogyGraph/GenealogyGraph.cs (modified) (4 diffs)

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

@@ -272 +272 @@
           var prevVertex = (IGenealogyGraphNode<T>)GenealogyGraph.GetByContent(elite);
           prevVertex.IsElite = true; // mark elites in the graph retroactively
-          var w = (IGenealogyGraphNode<T>)prevVertex.Clone();
-          var v = new GenealogyGraphNode<T>(prevVertex.Data) {
+          var v = new GenealogyGraphNode<T>((IDeepCloneable)prevVertex.Data.Clone()) {
             Rank = generation,
             Quality = prevVertex.Quality,
             IsElite = false
           };
-
-          object data = null;
-          if (prevVertex.InArcs.Any())
-            data = prevVertex.InArcs.Last().Data;
-          var children = prevVertex.Children.ToList();
-          var parents = prevVertex.Parents.ToList();
-
-          GenealogyGraph.RemoveVertex(prevVertex);
-          GenealogyGraph.AddVertex(w);
           GenealogyGraph.AddVertex(v);
-          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 (w.InArcs.Any())
-            w.InArcs.Last().Data = data;
+          GenealogyGraph.AddArc(prevVertex, v);
 
           // inject the graph node unique id to the scope
+          ExecutionContext.Scope.SubScopes[index].Variables[BeforeManipulatorOperator.ChildParameter.ActualName].Value = v.Data;
           ExecutionContext.Scope.SubScopes[index].Variables["Id"].Value = new StringValue(v.Id);
         }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs

@@ -38 +38 @@
 
     [Storable]
-    private Dictionary<double, List<IGenealogyGraphNode>> ranks; // use a linked list for fast insertion/removal
+    private Dictionary<double, List<IGenealogyGraphNode>> ranks;
+
     public Dictionary<double, List<IGenealogyGraphNode>> Ranks {
       get { return ranks; }
@@ -56 +57 @@
 
     [StorableConstructor]
-    protected GenealogyGraph(bool deserializing) : base(deserializing) { }
+    protected GenealogyGraph(bool deserializing)
+      : base(deserializing) {
+    }
+
     public GenealogyGraph() {
       Ranks = new Dictionary<double, List<IGenealogyGraphNode>>();
@@ -85 +89 @@
 
       if (idMap.ContainsKey(node.Id))
-        throw new InvalidOperationException("Duplicate content is not allowed in the genealogy graph.");
+        throw new InvalidOperationException("Duplicate ids are not allowed in the genealogy graph.");
       idMap[node.Id] = node;
     }
@@ -118 +122 @@
 
     public event EventHandler GraphUpdated;
+
     private void OnGraphUpdated(object sender, EventArgs args) {
       var updated = GraphUpdated;