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

Timestamp:

02/07/15 02:04:59 (9 years ago)

Author:

bburlacu

Message:

#1772: Small performance tweaks to the TraceCalculator. Reverted SubtreeCrossover to old behavior: do not clone subtrees (as it breaks tracing).

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/TraceCalculator.cs (modified) (2 diffs)

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

@@ -92 +92 @@
       int si = subtreeIndex; // subtree index
       int fi = 0; // fragment index
-      while (g.Parents.Any()) {
+      while (((List<IArc>)((IVertex)g).InArcs).Count > 0) {
+        //      while (g.Parents.Any()) {
         Debug.Assert(si < g.Data.Length);
         var inArcs = (List<IArc>)((IVertex)g).InArcs;
@@ -217 +218 @@
       int lastFi = lastTraceData.FragmentIndex; // last fragment index (index of the fragment in the previous trace node)
       var td = new TraceData(si, fi, lastSi, lastFi); // trace data
-      var arc = current.OutArcs.SingleOrDefault(a => a.Target == last && a.Data.Equals(td));
+      //var arc = current.OutArcs.SingleOrDefault(a => a.Target == last && a.Data.Equals(td));
+      var outArcs = (List<IArc>)((IVertex)current).OutArcs;
+      var arc = outArcs.FirstOrDefault(a => a.Target == last && ((IArc<IDeepCloneable>)a).Data.Equals(td));
       if (arc == null) {
         arc = new GenealogyGraphArc(current, last) { Data = td };