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

Timestamp:

05/26/14 01:56:35 (10 years ago)

Author:

bburlacu

Message:

#1772: Introduced separate class for FragmentNodes and adjusted tracing code. Fixed small bug creating the genealogy graph.

File:

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

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

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -50 +49 @@
 
     public override IOperation Apply() {
-      if (GenealogyGraph.Contains(ChildParameter.ActualValue)) {
+      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 child = ChildParameter.ActualValue;
-        var clone = (T)child.Clone();
-        var vChild = (IGenealogyGraphNode<T>)GenealogyGraph[child];
-        var vClone = new GenealogyGraphNode<T> { Content = clone, Rank = vChild.Rank - 0.5 };
+        var vClone = new GenealogyGraphNode<T> {
+          Content = (T)ChildParameter.ActualValue.Clone(),
+          Rank = vChild.Parents.Last().Rank + 0.5
+        };
         GenealogyGraph.AddVertex(vClone);
-        var parents = vChild.Parents; // parents of child become parents of clone
-        foreach (var p in parents) {
-          var arc = p.OutArcs.First(a => a.Target == vChild);
+
+        foreach (var arc in vChild.InArcs) {
           arc.Target = vClone;
           vClone.AddReverseArc(arc);
@@ -66 +65 @@
 
         vClone.InArcs.Last().Data = vChild.InArcs.Last().Data; // fragment of child becomes fragment of clone
-        vChild.InArcs = new List<IGenealogyGraphArc>(); // child will be connected to clone
         GenealogyGraph.AddArc(vClone, vChild);
 
@@ -75 +73 @@
         GenealogyGraph[parent.Content] = parent;
 
-      } else { // this needs to be checked
-        var vChild = new GenealogyGraphNode<T> { Content = ChildParameter.ActualValue, Rank = Generations.Value };
-        GenealogyGraph.AddVertex(vChild);
+      } 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);
       }
       return base.Apply();