Changeset 11978
 Timestamp:
 02/11/15 11:32:13 (6 years ago)
 Location:
 trunk/sources
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs
r11950 r11978 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 20022015 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; 
trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic3.4/SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs
r11951 r11978 36 36 "(* ( (variable 9.581e1 X6) (+ ( (variable 5.1491e1 X5) 1.614e+1) (+ (/ (variable 2.0539 X5) (variable 9.2452e1 X6)) (log (/ (variable 2.0539 X5) (variable 9.2452e1 X6)))))) 2.9081)", 37 37 9); 38 39 TestMatchedNodes("(* (* (* (variable 1.68 x) (* (variable 1.68 x) (variable 2.55 x))) (variable 1.68 x)) (* (* (variable 1.68 x) (* (variable 1.68 x) (* (variable 1.68 x) (variable 2.55 x)))) (variable 2.55 x)))", "(* (variable 2.55 x) (* (variable 1.68 x) (* (variable 1.68 x) (* (variable 1.68 x) (variable 2.55 x)))))", 9); 38 40 39 41 TestMatchedNodes("(+ (exp 2.1033) (/ 4.3072 (variable 2.4691 X7)))", "(/ 1 (+ (/ 4.3072 (variable 2.4691 X7)) (exp 2.1033)))", 6);
Note: See TracChangeset
for help on using the changeset viewer.