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

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

Files:

• Analyzers/SymbolicDataAnalysisInternalDiversityAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• Matching/SymbolicExpressionTreeMatching.cs (modified) (2 diffs)
• SimilarityCalculators/BottomUpTreeSimilarityCalculator.cs (moved) (moved from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SimilarityCalculators/BottomUpSimilarityCalculator.cs) (3 diffs)
• SimilarityCalculators/MaxCommonSubtreeSimilarityCalculator.cs (modified) (1 diff)
• SymbolicDataAnalysisProblem.cs (modified) (2 diffs)

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisInternalDiversityAnalyzer.cs

@@ -42 +42 @@
 
     private const string ResultCollectionParameterName = "Results";
-    private readonly BottomUpSimilarityCalculator busCalculator;
+    private readonly BottomUpTreeSimilarityCalculator busCalculator;
 
     public SymbolicDataAnalysisInternalDiversityAnalyzer() {
-      busCalculator = new BottomUpSimilarityCalculator();
+      busCalculator = new BottomUpTreeSimilarityCalculator();
 
       Parameters.Add(new ScopeTreeLookupParameter<ISymbolicExpressionTree>(SymbolicExpressionTreeParameterName));

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -225 +225 @@
     <Compile Include="Matching\SymbolicExpressionTreeNodeComparer.cs" />
     <Compile Include="Matching\SymbolicExpressionTreeNodeSimilarityComparer.cs" />
-    <Compile Include="SimilarityCalculators\BottomUpSimilarityCalculator.cs" />
+    <Compile Include="SimilarityCalculators\BottomUpTreeSimilarityCalculator.cs" />
     <Compile Include="SimilarityCalculators\MaxCommonSubtreeSimilarityCalculator.cs" />
     <Compile Include="SymbolicExpressionTreeBacktransformator.cs" />

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Matching/SymbolicExpressionTreeMatching.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -29 +50 @@
     /// </summary>
     /// <returns>Number of pairs that were matched</returns>
-    public static int Match(ISymbolicExpressionTreeNode a, ISymbolicExpressionTreeNode b, SymbolicExpressionTreeNodeSimilarityComparer comp) {
+    public static int Match(ISymbolicExpressionTreeNode a, ISymbolicExpressionTreeNode b, ISymbolicExpressionTreeNodeSimilarityComparer comp) {
       if (!comp.Equals(a, b)) return 0;
       int m = a.SubtreeCount;

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);

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

@@ -234 +234 @@
       Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
       Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());
-      Operators.Add(new BottomUpSimilarityCalculator());
+      Operators.Add(new BottomUpTreeSimilarityCalculator());
       ParameterizeOperators();
     }
@@ -359 +359 @@
       }
       foreach (var op in operators.OfType<SingleObjectivePopulationDiversityAnalyzer>()) {
-        op.SimilarityCalculator = operators.OfType<BottomUpSimilarityCalculator>().SingleOrDefault();
+        op.SimilarityCalculator = operators.OfType<BottomUpTreeSimilarityCalculator>().SingleOrDefault();
       }
     }