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

Timestamp:

07/30/14 13:44:14 (10 years ago)

Author:

bburlacu

Message:

#2215:

• Renamed BottomUpSimilarityCalculator to BottomUpTreeSimilarityCalculator.
• Refactored the BottomUpTreeSimilarityCalculator to accept a configurable list of commutative symbols (the children of commutative symbols need to be sorted according to their label).
• Added MaxCommonSubtreeSimilarityCalculator performance test
• Updated BottomUpTreeSimilarityCalculatorTest

Location:

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

Files:

• BottomUpTreeSimilarityCalculator.cs (moved) (moved from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SimilarityCalculators/BottomUpSimilarityCalculator.cs) (3 diffs)
• MaxCommonSubtreeSimilarityCalculator.cs (modified) (1 diff)

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

@@ -31 +31 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
-  [Item("BottomUpSimilarityCalculator", "A similarity calculator which uses the tree bottom-up distance as a similarity metric.")]
-  public class BottomUpSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
-    private readonly HashSet<string> commutativeSymbols = new HashSet<string> { "Addition", "Multiplication", "Average", "And", "Or", "Xor" };
-
-    public BottomUpSimilarityCalculator() { }
+  [Item("BottomUpTreeSimilarityCalculator", "A similarity calculator which uses the tree bottom-up distance as a similarity metric.")]
+  public class BottomUpTreeSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
+    private readonly HashSet<string> commutativeSymbols;
+
+    public BottomUpTreeSimilarityCalculator() {
+      commutativeSymbols = new HashSet<string>();
+    }
+
+    public BottomUpTreeSimilarityCalculator(IEnumerable<string> commutativeSymbols) {
+      this.commutativeSymbols = new HashSet<string>(commutativeSymbols);
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new BottomUpSimilarityCalculator(this, cloner);
-    }
-
-    protected BottomUpSimilarityCalculator(BottomUpSimilarityCalculator original, Cloner cloner)
+      return new BottomUpTreeSimilarityCalculator(this, cloner);
+    }
+
+    protected BottomUpTreeSimilarityCalculator(BottomUpTreeSimilarityCalculator original, Cloner cloner)
       : base(original, cloner) {
     }
@@ -57 +63 @@
 
       return similarity;
+    }
+
+    public bool AddCommutativeSymbol(string symbolName) {
+      return commutativeSymbols.Add(symbolName);
+    }
+
+    public bool RemoveCommutativeSymbol(string symbolName) {
+      return commutativeSymbols.Remove(symbolName);
     }
 
@@ -187 +201 @@
     }
 
+    /// <summary>
+    /// This method iterates the nodes of a subtree in breadth order while also sorting the subtrees of commutative symbols based on their label.
+    /// This is necessary in order for the mapping to be realized correctly.
+    /// </summary>
+    /// <param name="node">The root of the subtree</param>
+    /// <returns>A list of nodes in breadth order (with children of commutative symbols sorted by label)</returns>
     private IEnumerable<ISymbolicExpressionTreeNode> IterateBreadthOrdered(ISymbolicExpressionTreeNode node) {
       var list = new List<ISymbolicExpressionTreeNode> { node };

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

@@ -56 +56 @@
     }
 
-    public static double MaxCommonSubtreeSimilarity(ISymbolicExpressionTree a, ISymbolicExpressionTree b, SymbolicExpressionTreeNodeSimilarityComparer comparer) {
+    public static double MaxCommonSubtreeSimilarity(ISymbolicExpressionTree a, ISymbolicExpressionTree b, ISymbolicExpressionTreeNodeSimilarityComparer comparer) {
       int max = 0;
       var rootA = a.Root.GetSubtree(0).GetSubtree(0);