Changeset 18141 for trunk/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

12/16/21 10:23:29 (3 years ago)

Author:

chaider

Message:

#3140 merged branch into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeNodeEqualityComparer.cs (modified) (3 diffs)

trunk/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)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeNodeEqualityComparer.cs

@@ -33 +33 @@
     protected SymbolicExpressionTreeNodeEqualityComparer(SymbolicExpressionTreeNodeEqualityComparer original, Cloner cloner)
       : base(original, cloner) {
-      matchParameterValues = original.matchParameterValues;
+      matchNumericValues = original.matchNumericValues;
       matchVariableNames = original.matchVariableNames;
       matchVariableWeights = original.matchVariableWeights;
@@ -41 +41 @@
     // more flexible matching criteria 
     [Storable]
-    private bool matchParameterValues;
+    private bool matchNumericValues;
     public bool MatchParameterValues {
-      get { return matchParameterValues; }
-      set { matchParameterValues = value; }
+      get { return matchNumericValues; }
+      set { matchNumericValues = value; }
     }
 
@@ -66 +66 @@
 
     public SymbolicExpressionTreeNodeEqualityComparer() {
-      matchParameterValues = true;
+      matchNumericValues = true;
       matchVariableNames = true;
       matchVariableWeights = true;