Changeset 11889 for branches

Timestamp:

02/04/15 15:40:40 (10 years ago)

Author:

bburlacu

Message:

#2215: Set matching properties when cloning in the BottomUpSimilarityCalculator. Always match variable names in the MaxCommonSubtreeSimilarityCalculator (remove property), add license header to SymbolicExpressionTreeNodeSimilarityComparer.cs.

Location:

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

Files:

• Matching/SymbolicExpressionTreeNodeSimilarityComparer.cs (modified) (1 diff)
• SimilarityCalculators/BottomUpSimilarityCalculator.cs (modified) (1 diff)
• SimilarityCalculators/MaxCommonSubtreeSimilarityCalculator.cs (modified) (3 diffs)

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

@@ -1 @@
-using HeuristicLab.Common;
+#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 HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;

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

@@ -43 +43 @@
     protected BottomUpSimilarityCalculator(BottomUpSimilarityCalculator original, Cloner cloner)
       : base(original, cloner) {
+      MatchVariableWeights = original.MatchVariableWeights;
+      MatchConstantValues = original.MatchConstantValues;
     }
 

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

@@ -33 +33 @@
     [Storable]
     private readonly SymbolicExpressionTreeNodeSimilarityComparer comparer;
-    public bool MatchVariableNames {
-      get { return comparer.MatchVariableNames; }
-      set { comparer.MatchVariableNames = value; }
-    }
-
     public bool MatchVariableWeights {
       get { return comparer.MatchVariableWeights; }
@@ -57 +52 @@
     protected MaxCommonSubtreeSimilarityCalculator(MaxCommonSubtreeSimilarityCalculator original, Cloner cloner)
       : base(original, cloner) {
+      comparer = cloner.Clone(original.comparer);
     }
 
@@ -67 +63 @@
     }
 
-    public MaxCommonSubtreeSimilarityCalculator(bool matchVariableNames, bool matchVariableWeights, bool matchConstantValues) {
+    public MaxCommonSubtreeSimilarityCalculator(bool matchVariableWeights, bool matchConstantValues) {
       comparer = new SymbolicExpressionTreeNodeSimilarityComparer {
         MatchConstantValues = matchConstantValues,
-        MatchVariableNames = matchVariableNames,
+        MatchVariableNames = true,
         MatchVariableWeights = matchVariableWeights
       };