Changeset 11858 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

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.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• Tracking/TraceCalculator.cs (modified) (7 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -326 +326 @@
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionAfterManipulatorOperator.cs" />
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionBeforeManipulatorOperator.cs" />
-    <Compile Include="Tracking\SymbolicDataAnalysisExpressionTracing.cs" />
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />

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

@@ -100 +100 @@
       while (g.Parents.Any()) {
         Debug.Assert(si < g.Data.Length);
-        var parents = g.Parents.ToList();
-        var fragment = (IFragment<ISymbolicExpressionTreeNode>)g.InArcs.Last().Data;
+        var inArcs = (List<IArc>)((IVertex)g).InArcs;
+        var fragment = (IFragment<ISymbolicExpressionTreeNode>)inArcs.Last().Data;
         if (fragment == null) {
           // TODO: think about what the correct behavior should be here (seems good so far)
           // the node is either an elite node or (in rare cases) no fragment was transferred
-          g = parents[0];
+          g = (IGenealogyGraphNode<ISymbolicExpressionTree>)inArcs[0].Source;
           continue;
         }
@@ -114 +114 @@
 
         #region trace crossover
-        if (parents.Count == 2) {
+        if (inArcs.Count == 2) {
+          var parent0 = (IGenealogyGraphNode<ISymbolicExpressionTree>)inArcs[0].Source;
+          var parent1 = (IGenealogyGraphNode<ISymbolicExpressionTree>)inArcs[1].Source;
           if (fi == si) {
-            g = parents[1];
+            g = parent1;
             si = fragment.Index2;
             continue;
@@ -123 +125 @@
             if (fi + fl > si) {
               // fragment contains subtree
-              g = parents[1];
+              g = parent1;
               si += fragment.Index2 - fi;
             } else {
               // fragment distinct from subtree
-              g = parents[0];
+              g = parent0;
               si += NodeAt(g.Data, fi).GetLength() - fl;
             }
@@ -136 +138 @@
               // subtree contains fragment => branching point in the fragment graph
               var n = GetTraceNode(g, si, fi);
-              TraceRecursive(parents[0], si, n);
-              TraceRecursive(parents[1], fragment.Index2, n);
+              TraceRecursive(parent0, si, n);
+              TraceRecursive(parent1, fragment.Index2, n);
               break;
             } else {
               // subtree and fragment are distinct. 
-              g = parents[0];
+              g = parent0;
               continue;
             }
@@ -150 +152 @@
         // mutation is handled in a simple way: we branch every time there is an overlap between the subtree and the fragment
         // (since mutation effects can be quite unpredictable: replace branch, change node, shake tree, etc)
-        if (parents.Count == 1) {
+        if (inArcs.Count == 1) {
+          var parent0 = (IGenealogyGraphNode<ISymbolicExpressionTree>)inArcs[0].Source;
           Debug.Assert(fragment.Index1 == fragment.Index2);
           // check if the subtree and the fragment overlap => branch out
@@ -156 +159 @@
             var n = GetTraceNode(g, si, fi);
             int i = si < fi ? si : fi;
-            TraceRecursive(parents[0], i, n);
+            TraceRecursive(parent0, i, n);
             break;
           } else {
             // if they don't overlap, go up
-            g = parents[0];
+            g = parent0;
             if (fi < si)
               si += NodeAt(g.Data, fi).GetLength() - fl;
@@ -212 +215 @@
     /// <param name="last">The last added node in the trace graph</param>
     private void ConnectLast(IGenealogyGraphNode<ISymbolicExpressionTree> g, int si, IGenealogyGraphNode<ISymbolicExpressionTree> last) {
-      IFragment<ISymbolicExpressionTreeNode> fragment = g.Parents.Any() ? (IFragment<ISymbolicExpressionTreeNode>)g.InArcs.Last().Data : null;
+      var inArcs = (List<IArc>)((IVertex)g).InArcs;
+      var fragment = g.Parents.Any() ? (IFragment<ISymbolicExpressionTreeNode>)inArcs.Last().Data : null;
       int fi = fragment == null ? 0 : fragment.Index1; // fragment index
       var n = GetTraceNode(g, si, fi); // will append n to the trace graph if it does not exist