Changeset 18140 for branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs

Timestamp:

12/16/21 10:17:00 (2 years ago)

Author:

chaider

Message:

#3140

• Moved init of variable ranges to base class
• Changed signature order of ShapeConstrainedRegressionProblemData
• Fixed naming in SymbolicExpressionTreeNodeEqualityComparer, SymbolicExpressionTreeBottomUpSimilarityCalculator

File:

• branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs (modified) (3 diffs)

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs

@@ -41 +41 @@
     protected override bool IsCommutative { get { return true; } }
 
-    public bool MatchParameterValues { get; set; }
+    public bool MatchNumericValues { get; set; }
     public bool MatchVariableWeights { get; set; }
 
@@ -74 +74 @@
 
     public static NodeMap ComputeBottomUpMapping(ISymbolicExpressionTreeNode n1, ISymbolicExpressionTreeNode n2, bool strict = false) {
-      var calculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchParameterValues = strict, MatchVariableWeights = strict };
+      var calculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchNumericValues = strict, MatchVariableWeights = strict };
       return calculator.ComputeBottomUpMapping(n1, n2);
     }
@@ -211 +211 @@
 
       if (node is INumericTreeNode numNode)
-        return MatchParameterValues ? numNode.Value.ToString(CultureInfo.InvariantCulture) : "Numeric";
+        return MatchNumericValues ? numNode.Value.ToString(CultureInfo.InvariantCulture) : "Numeric";
 
       if (node is VariableTreeNode variable)