Changeset 11986 for stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 11978
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic merged: 11978
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs
r11964 r11986 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 81 81 82 82 // visit nodes in order of decreasing height to ensure correct mapping 83 var nodes1 = n1.IterateNodesPrefix(). ToList();83 var nodes1 = n1.IterateNodesPrefix().OrderByDescending(x => x.GetDepth()).ToList(); 84 84 var nodes2 = n2.IterateNodesPrefix().ToList(); 85 85 for (int i = 0; i < nodes1.Count; ++i) { … … 98 98 if (w == null) continue; 99 99 100 // at this point we know that v and w are isomorphic, however, the mapping cannot be done directly (as in the paper) because the trees are unordered (subtree order might differ) 101 // the solution is to sort subtrees by label using IterateBreadthOrdered (this will work because the subtrees are isomorphic!) and simultaneously iterate over the two subtrees 100 // at this point we know that v and w are isomorphic, however, the mapping cannot be done directly 101 // (as in the paper) because the trees are unordered (subtree order might differ). the solution is 102 // to sort subtrees from under commutative labels (this will work because the subtrees are isomorphic!) 103 // while iterating over the two subtrees 102 104 var vv = IterateBreadthOrdered(v, comparer).ToList(); 103 105 var ww = IterateBreadthOrdered(w, comparer).ToList(); … … 133 135 foreach (var n in nodes) { 134 136 if (n.SubtreeCount == 0) { 135 var label = Label(n);137 var label = GetLabel(n); 136 138 if (!labelMap.ContainsKey(label)) { 137 139 var z = new GraphNode { SymbolicExpressionTreeNode = n, Label = label }; … … 209 211 } 210 212 211 private st ringLabel(ISymbolicExpressionTreeNode node) {213 private static string GetLabel(ISymbolicExpressionTreeNode node) { 212 214 if (node.SubtreeCount > 0) 213 215 return node.Symbol.Name;
Note: See TracChangeset
for help on using the changeset viewer.