Changeset 18145 for branches/3140_NumberSymbol

Timestamp:

12/16/21 13:17:38 (2 years ago)

Author:

chaider

Message:

#3140

• Fixed naming in SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculator, SymbolicExpressionTreeNodeEqualityComparer and ISymbolicExpressionTreeNodeSimilarityComparer
• Fixed tests in SymbolicExpressionTreeBottomUpSimilarityCalculatorTest

Location:

branches/3140_NumberSymbol

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeNodeSimilarityComparer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculator.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeNodeEqualityComparer.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs (modified) (2 diffs)

branches/3140_NumberSymbol/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeNodeSimilarityComparer.cs

@@ -6 +6 @@
   [StorableType("c4de8ab2-616d-4c73-9f9c-59545ac38199")]
   public interface ISymbolicExpressionTreeNodeSimilarityComparer : IEqualityComparer<ISymbolicExpressionTreeNode>, IItem {
-    bool MatchParameterValues { get; set; }
+    bool MatchNumericValues { get; set; }
     bool MatchVariableWeights { get; set; }
     bool MatchVariableNames { get; set; }

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

@@ -39 +39 @@
 
     public bool MatchParameterValues {
-      get { return comparer.MatchParameterValues; }
-      set { comparer.MatchParameterValues = value; }
+      get { return comparer.MatchNumericValues; }
+      set { comparer.MatchNumericValues = value; }
     }
 
@@ -59 +59 @@
     public SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculator() {
       comparer = new SymbolicExpressionTreeNodeEqualityComparer {
-        MatchParameterValues = true,
+        MatchNumericValues = true,
         MatchVariableNames = true,
         MatchVariableWeights = true
@@ -67 +67 @@
     public SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculator(bool matchVariableWeights, bool matchParameterValues) {
       comparer = new SymbolicExpressionTreeNodeEqualityComparer {
-        MatchParameterValues = matchParameterValues,
+        MatchNumericValues = matchParameterValues,
         MatchVariableNames = true,
         MatchVariableWeights = matchVariableWeights

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

@@ -42 +42 @@
     [Storable]
     private bool matchNumericValues;
-    public bool MatchParameterValues {
+    public bool MatchNumericValues {
       get { return matchNumericValues; }
       set { matchNumericValues = value; }
@@ -90 +90 @@
         var cb = b as INumericTreeNode;
         if (cb == null) return false;
-        return (!MatchParameterValues || ca.Value.Equals(cb.Value));
+        return (!MatchNumericValues || ca.Value.Equals(cb.Value));
       }
       return false;

branches/3140_NumberSymbol/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs

@@ -82 +82 @@
       var sw = new Stopwatch();
 
-      var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchVariableWeights = false, MatchParameterValues = false };
+      var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchVariableWeights = false, MatchNumericValues = false };
 
       sw.Start();
@@ -117 +117 @@
       var trees = Util.CreateRandomTrees(twister, ds, grammar, N, 100);
 
-      var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchParameterValues = strict, MatchVariableWeights = strict };
+      var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchNumericValues = strict, MatchVariableWeights = strict };
       var bottomUpSimilarity = 0d;
       for (int i = 0; i < trees.Length - 1; ++i) {