Changeset 11888 for branches/HeuristicLab.BottomUpTreeDistance

Timestamp:

02/04/15 15:17:22 (10 years ago)

Author:

bburlacu

Message:

#2215: MaxCommonSubtreeSimilarityCalculator: added properties for matching settings, added storable constructor, fixed bug in similarity calculation.

File:

• branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SimilarityCalculators/MaxCommonSubtreeSimilarityCalculator.cs (modified) (4 diffs)

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

@@ -31 +31 @@
   [Item("MaxCommonSubtreeSimilarityCalculator", "A similarity calculator based on the size of the maximum common subtree between two trees")]
   public class MaxCommonSubtreeSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
-    public MaxCommonSubtreeSimilarityCalculator() { }
+    [Storable]
+    private readonly SymbolicExpressionTreeNodeSimilarityComparer comparer;
+    public bool MatchVariableNames {
+      get { return comparer.MatchVariableNames; }
+      set { comparer.MatchVariableNames = value; }
+    }
+
+    public bool MatchVariableWeights {
+      get { return comparer.MatchVariableWeights; }
+      set { comparer.MatchVariableWeights = value; }
+    }
+
+    public bool MatchConstantValues {
+      get { return comparer.MatchConstantValues; }
+      set { comparer.MatchConstantValues = value; }
+    }
+
+    [StorableConstructor]
+    protected MaxCommonSubtreeSimilarityCalculator(bool deserializing) : base(deserializing) { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new MaxCommonSubtreeSimilarityCalculator(this, cloner);
+    }
 
     protected MaxCommonSubtreeSimilarityCalculator(MaxCommonSubtreeSimilarityCalculator original, Cloner cloner)
@@ -37 +59 @@
     }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new MaxCommonSubtreeSimilarityCalculator(this, cloner);
+    public MaxCommonSubtreeSimilarityCalculator() {
+      comparer = new SymbolicExpressionTreeNodeSimilarityComparer {
+        MatchConstantValues = true,
+        MatchVariableNames = true,
+        MatchVariableWeights = true
+      };
+    }
+
+    public MaxCommonSubtreeSimilarityCalculator(bool matchVariableNames, bool matchVariableWeights, bool matchConstantValues) {
+      comparer = new SymbolicExpressionTreeNodeSimilarityComparer {
+        MatchConstantValues = matchConstantValues,
+        MatchVariableNames = matchVariableNames,
+        MatchVariableWeights = matchVariableWeights
+      };
+    }
+
+    public double CalculateSimilarity(ISymbolicExpressionTree t1, ISymbolicExpressionTree t2) {
+      return MaxCommonSubtreeSimilarity(t1, t2, comparer);
     }
 
@@ -47 +85 @@
       if (t1 == null || t2 == null)
         throw new ArgumentException("Cannot calculate similarity when one of the arguments is null.");
-      var comparer = new SymbolicExpressionTreeNodeSimilarityComparer {
-        MatchConstantValues = true,
-        MatchVariableNames = true,
-        MatchVariableWeights = true
-      };
 
       return MaxCommonSubtreeSimilarity(t1, t2, comparer);
@@ -67 +100 @@
           if (lenB <= max) continue;
           int matches = SymbolicExpressionTreeMatching.Match(aa, bb, comparer);
-          if (matches == lenB && max < matches)
+          if (max < matches)
             max = matches;
         }