Changeset 11964 for stable

Timestamp:

02/06/15 18:15:15 (10 years ago)

Author:

ascheibe

Message:

#2310 merged r11950, r11951 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs (modified) (3 diffs)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs (modified) (1 diff)

stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs

@@ -36 +36 @@
   public class SymbolicExpressionTreeBottomUpSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
     private readonly HashSet<string> commutativeSymbols = new HashSet<string> { "Addition", "Multiplication", "Average", "And", "Or", "Xor" };
-    public bool MatchVariableWeights { get; set; }
-    public bool MatchConstantValues { get; set; }
-
     public SymbolicExpressionTreeBottomUpSimilarityCalculator() { }
 
@@ -48 +45 @@
     protected SymbolicExpressionTreeBottomUpSimilarityCalculator(SymbolicExpressionTreeBottomUpSimilarityCalculator original, Cloner cloner)
       : base(original, cloner) {
-      MatchVariableWeights = original.MatchVariableWeights;
-      MatchConstantValues = original.MatchConstantValues;
     }
 
@@ -220 +215 @@
       var constant = node as ConstantTreeNode;
       if (constant != null)
-        return MatchConstantValues ? constant.Value.ToString(CultureInfo.InvariantCulture) : constant.Symbol.Name;
+        return constant.Value.ToString(CultureInfo.InvariantCulture);
+
       var variable = node as VariableTreeNode;
-      if (variable != null) {
-        return MatchVariableWeights ? variable.Weight + variable.VariableName : variable.VariableName;
-      }
+      if (variable != null)
+        return variable.Weight + variable.VariableName;
 
       return node.ToString();

stable/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs

@@ -15 +15 @@
 
     public BottomUpSimilarityCalculatorTest() {
-      busCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchConstantValues = true, MatchVariableWeights = true };
+      busCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator();
       importer = new SymbolicExpressionImporter();
     }