Changeset 10890 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs

Timestamp:

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

Author:

bburlacu

Message:

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

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs (modified) (2 diffs)

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();
     }