Changeset 11487 for branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SimilarityCalculators

Timestamp:

10/22/14 17:18:07 (10 years ago)

Author:

bburlacu

Message:

#2215: Further improved performance of the BottomUpSimilarityCalculator.

File:

• branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SimilarityCalculators/BottomUpSimilarityCalculator.cs (modified) (2 diffs)

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SimilarityCalculators/BottomUpSimilarityCalculator.cs

@@ -79 +79 @@
 
       // visit nodes in order of decreasing height to ensure correct mapping
-      foreach (var v in n1.IterateNodesPrefix().OrderByDescending(x => compactedGraph[x].Depth)) {
+      var nodes1 = n1.IterateNodesPrefix().ToList();
+      var nodes2 = n2.IterateNodesPrefix().ToList();
+      foreach (var v in nodes1) {
         if (forwardMap.ContainsKey(v))
           continue;
         var kv = compactedGraph[v];
         ISymbolicExpressionTreeNode w = null;
-        foreach (var t in n2.IterateNodesPrefix()) {
+        foreach (var t in nodes2) {
           if (reverseMap.ContainsKey(t) || compactedGraph[t] != kv)
             continue;
@@ -123 +125 @@
 
       var nodes = n1.IterateNodesPostfix().Concat(n2.IterateNodesPostfix()); // the disjoint union F
-      var list = new List<GraphNode>(); // preallocate size to avoid list resizing as it has a performance hit
+      var list = new List<GraphNode>();
       var queue = new Queue<ISymbolicExpressionTreeNode>();