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

Timestamp:

02/02/15 13:58:40 (9 years ago)

Author:

bburlacu

Message:

#1772: Micro optimization inside the TraceCalculator and inside the GenealogyGraphNode (Children and Parents properties), resulting in maybe 25% speed gain. Corrected item name for the BeforeCrossoverOperator, very minor refactoring inside the BeforeManipulatorOperator. Updated project file.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs (modified) (1 diff)

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

@@ -53 +53 @@
     public override IOperation Apply() {
       // since mutation always takes place after crossover, the vertex for the current child is already in the tree
-      var childVertex = GenealogyGraph.GetByContent(ChildParameter.ActualValue);
-      var clonedVertex = (IGenealogyGraphNode<T>)childVertex.Clone();
-      clonedVertex.Rank = childVertex.Rank - 0.5;
-      GenealogyGraph.AddVertex(clonedVertex);
+      var vChild = GenealogyGraph.GetByContent(ChildParameter.ActualValue);
+      var vClone = (IGenealogyGraphNode<T>)vChild.Clone();
+      vClone.Rank = vChild.Rank - 0.5;
+      GenealogyGraph.AddVertex(vClone);
 
-      var arcs = childVertex.InArcs.ToList();
+      var arcs = vChild.InArcs.ToList();
       foreach (var arc in arcs) {
         var p = arc.Source;
         GenealogyGraph.RemoveArc(arc);
-        GenealogyGraph.AddArc(new GenealogyGraphArc(p, clonedVertex));
+        GenealogyGraph.AddArc(new GenealogyGraphArc(p, vClone));
       }
       // by convention, the arc connecting child with parent (non-root parent in case of crossover)
       // holds fragment data when applicable. the following line of code preserves this data 
       // the graph arcs are now connecting parent (rank n) --> clone (rank n+0.5) --> child (rank n+1)
-      clonedVertex.InArcs.Last().Data = arcs.Last().Data;
-      GenealogyGraph.AddArc(new GenealogyGraphArc(clonedVertex, childVertex));
+      vClone.InArcs.Last().Data = arcs.Last().Data;
+      GenealogyGraph.AddArc(new GenealogyGraphArc(vClone, vChild));
 
       return base.Apply();