Changeset 11486 for branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Tests/BottomUpTreeSimilarityCalculatorTest.cs

Timestamp:

10/21/14 19:56:48 (10 years ago)

Author:

bburlacu

Message:

#2215: Renamed BottomUpTreeSimilarityCalculator to BottomUpSimilarityCalculator, improved performance by 10% by using the SymbolicExpressionTreeNodeComparer for ordering nodes (instead of string.Compare on node.ToString()). Updated the rest of the files accordingly.

File:

• branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Tests/BottomUpTreeSimilarityCalculatorTest.cs (modified) (3 diffs)

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Tests/BottomUpTreeSimilarityCalculatorTest.cs

@@ -14 +14 @@
   [TestClass]
   public class BottomUpSimilarityCalculatorTest {
-    private readonly BottomUpTreeSimilarityCalculator busCalculator;
+    private readonly BottomUpSimilarityCalculator busCalculator;
     private readonly SymbolicExpressionImporter importer;
 
@@ -22 +22 @@
 
     public BottomUpSimilarityCalculatorTest() {
-      busCalculator = new BottomUpTreeSimilarityCalculator(new List<string> { "Addition", "Multiplication", "And", "Or", "Xor" });
+      busCalculator = new BottomUpSimilarityCalculator { MatchConstantValues = true, MatchVariableWeights = true };
       importer = new SymbolicExpressionImporter();
     }
@@ -85 +85 @@
       for (int i = 0; i < trees.Length - 1; ++i) {
         for (int j = i + 1; j < trees.Length; ++j) {
-          s += busCalculator.CalculateSolutionSimilarity(trees[i], trees[j]);
+          s += busCalculator.CalculateSimilarity(trees[i], trees[j]);
         }
       }