Changeset 11215 for branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeDistance/BottomUpTreeDistanceCalculator.cs

Timestamp:

07/22/14 12:42:20 (10 years ago)

Author:

bburlacu

Message:

#2215: Code clean-up and small performance improvements.

File:

• branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeDistance/BottomUpTreeDistanceCalculator.cs (modified) (5 diffs)

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeDistance/BottomUpTreeDistanceCalculator.cs

@@ -26 +26 @@
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -94 +93 @@
     private static Dictionary<ISymbolicExpressionTreeNode, IVertex> Compact(ISymbolicExpressionTree t1, ISymbolicExpressionTree t2) {
       var nodesToVertices = new Dictionary<ISymbolicExpressionTreeNode, IVertex>(); // K
-      var disjointUnion = new DisjointUnion(t1, t2); // F
       var labelsToVertices = new Dictionary<string, IVertex>(); // L
       var childrenCount = new Dictionary<ISymbolicExpressionTreeNode, int>(); // Children
       var vertices = new List<IVertex>(); // G
-
-      var nodes = disjointUnion.Nodes.ToList();
+      var nodes = t1.IterateNodesPostfix().Concat(t2.IterateNodesPostfix()); // the disjoint union F
 
       // for all leaf labels l in F
@@ -125 +122 @@
         } else {
           bool found = false;
+          var height = Height(v);
           // for all nodes w in G in reverse order
           for (int i = vertices.Count - 1; i >= 0; --i) {
             var w = vertices[i];
-            if (Height(v) != Height(w) || v.SubtreeCount != w.OutDegree || label != w.Label)
+            if (height != Height(w) || v.SubtreeCount != w.OutDegree || label != w.Label)
               continue;
 
@@ -182 +180 @@
     }
 
-
     private static string Label(ISymbolicExpressionTreeNode n) {
       return n.ToString();
@@ -195 +192 @@
     }
 
-    private class DisjointUnion : Tuple<ISymbolicExpressionTree, ISymbolicExpressionTree> {
-      public DisjointUnion(ISymbolicExpressionTree t1, ISymbolicExpressionTree t2)
-        : base(t1, t2) {
-      }
-
-      public IEnumerable<ISymbolicExpressionTreeNode> Nodes {
-        get { return Item1.Root.IterateNodesPostfix().Concat(Item2.Root.IterateNodesPostfix()); }
-      }
-    }
-
-    public static string RemoveFirstLines(string text, int linesCount) {
-      var lines = Regex.Split(text, "\r\n|\r|\n").Skip(linesCount);
-      return string.Join(Environment.NewLine, lines.ToArray());
-    }
-
+    // this is here for debugging purposes only
     // draw the mapping between t1 and t2 as a tikz picture
     private static string FormatMapping(ISymbolicExpressionTree t1, ISymbolicExpressionTree t2, Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> map) {