Changeset 10890

Timestamp:

05/26/14 16:28:09 (11 years ago)

Author:

bburlacu

Message:

#1772: Deleted unused VisualGenealogyGraphTextLabel.cs, fixed tracking code in BeforeManipulatorOperator.cs, re-added setters for vertex in- and outArcs.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.EvolutionTracking.Views/3.4/VisualGenealogyGraphTextLabel.cs (deleted)
• HeuristicLab.EvolutionTracking/3.4/DirectedGraph/Vertex.cs (modified) (2 diffs)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraphNode.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/Interfaces/IGenealogyGraphNode.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/Operators/BeforeCrossoverOperator.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SymbolicDataAnalysisExpressionAfterCrossoverOperator.cs (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/Vertex.cs

@@ -46 +46 @@
     public IEnumerable<IArc> InArcs {
       get { return inArcs ?? Enumerable.Empty<IArc>(); }
+      set { inArcs = value.ToList(); }
     }
     [Storable]
@@ -51 +52 @@
     public IEnumerable<IArc> OutArcs {
       get { return outArcs ?? Enumerable.Empty<IArc>(); }
+      set { outArcs = value.ToList(); }
     }
     [Storable]

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

@@ -43 +43 @@
     public new IEnumerable<IGenealogyGraphArc> InArcs {
       get { return base.InArcs.Cast<IGenealogyGraphArc>(); }
+      set { base.InArcs = value; }
     }
     public new IEnumerable<IGenealogyGraphArc> OutArcs {
       get { return base.OutArcs.Cast<IGenealogyGraphArc>(); }
+      set { base.OutArcs = value; }
     }
     public IEnumerable<IGenealogyGraphNode> Ancestors {

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

@@ -33 +33 @@
     IEnumerable<IGenealogyGraphNode> Ancestors { get; }
     IEnumerable<IGenealogyGraphNode> Descendants { get; }
-    new IEnumerable<IGenealogyGraphArc> InArcs { get; }
-    new IEnumerable<IGenealogyGraphArc> OutArcs { get; }
+    new IEnumerable<IGenealogyGraphArc> InArcs { get; set; }
+    new IEnumerable<IGenealogyGraphArc> OutArcs { get; set; }
   }
 

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeCrossoverOperator.cs

@@ -81 +81 @@
         // but the first parent is actually the future child so we use this
         Content = parents[0],
-        //        Rank = Generations.Value + 1
         Rank = parentVertices[0].Rank + 1
       };

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Linq;
 using HeuristicLab.Common;
@@ -49 +50 @@
 
     public override IOperation Apply() {
-      var vChild = (IGenealogyGraphNode<T>)GenealogyGraph[ChildParameter.ActualValue];
-      if (vChild.Rank.IsAlmost(Generations.Value + 1)) {
-        // if the graph already contains a vertex representing the child, it means that the child is a product of crossover
-        // when mutation follows after crossover, some changes need to be made to the graph to maintain consistency
-        var vClone = new GenealogyGraphNode<T> {
-          Content = (T)ChildParameter.ActualValue.Clone(),
-          Rank = vChild.Parents.Last().Rank + 0.5
-        };
-        GenealogyGraph.AddVertex(vClone);
+      // since mutation always takes place after crossover, the vertex for the current child is already in the tree
+      var v = (IGenealogyGraphNode<T>)GenealogyGraph[ChildParameter.ActualValue];
 
-        foreach (var arc in vChild.InArcs) {
-          arc.Target = vClone;
-          vClone.AddReverseArc(arc);
-        }
+      if (!v.Rank.IsAlmost(Generations.Value + 1)) {
+        throw new Exception("Child rank should be generations.value + 1");
+      }
+      var clone = (T)ChildParameter.ActualValue.Clone();
 
-        vClone.InArcs.Last().Data = vChild.InArcs.Last().Data; // fragment of child becomes fragment of clone
-        GenealogyGraph.AddArc(vClone, vChild);
+      var c = new GenealogyGraphNode<T> {
+        Rank = v.Rank - 0.5,
+        Content = clone
+      };
 
-        // the following step in necessary because some mutation operators change values while the reference stays the same
-        // so we clone in order to prevent mutations to be "shadowed" in the parent
-        var parent = vClone.Parents.First();
-        parent.Content = (T)parent.Content.Clone();
-        GenealogyGraph[parent.Content] = parent;
+      foreach (var a in v.InArcs) {
+        a.Target = c;
+        c.AddReverseArc(a);
+      }
 
-      } else if (vChild.Rank.IsAlmost(Generations.Value)) {
-        var clone = (T)ChildParameter.ActualValue.Clone();
-        GenealogyGraph.SetContent(vChild, clone);
-        var xx = new GenealogyGraphNode<T> { Content = ChildParameter.ActualValue, Rank = Generations.Value + 1 };
-        GenealogyGraph.AddVertex(xx);
-        GenealogyGraph.AddArc(vChild, xx);
-      }
+      v.InArcs = Enumerable.Empty<IGenealogyGraphArc>();
+
+      GenealogyGraph.AddVertex(c);
+      GenealogyGraph.AddArc(c, v);
+
       return base.Apply();
     }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SymbolicDataAnalysisExpressionAfterCrossoverOperator.cs

@@ -30 +30 @@
   public class SymbolicDataAnalysisExpressionAfterCrossoverOperator : AfterCrossoverOperator<ISymbolicExpressionTree> {
     public override IOperation Apply() {
-      var child = ChildParameter.ActualValue;
-      var childVertex = (IGenealogyGraphNode)GenealogyGraph[child];
+      var childVertex = (IGenealogyGraphNode<ISymbolicExpressionTree>)GenealogyGraph[ChildParameter.ActualValue];
       var arcs = childVertex.InArcs.ToList();
       var nodes0 = (List<ISymbolicExpressionTreeNode>)arcs[0].Data;
       var nodes1 = (List<ISymbolicExpressionTreeNode>)arcs[1].Data;
-      var childNodes = child.IterateNodesPrefix().ToList();
+      var childNodes = childVertex.Content.IterateNodesPrefix().ToList();
       IFragment<ISymbolicExpressionTreeNode> fragment = null;
       for (int i = 0; i < Math.Min(nodes0.Count, childNodes.Count); ++i) {