Changeset 11220 for branches

Timestamp:

07/23/14 16:00:53 (10 years ago)

Author:

bburlacu

Message:

#2215: Added a couple more test cases in the matching unit test.

Location:

branches/HeuristicLab.BottomUpTreeDistance

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SimilarityCalculators/BottomUpSimilarityCalculator.cs (modified) (1 diff)
• HeuristicLab.Tests/BottomUpSimilarityCalculatorTest.cs (modified) (1 diff)

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SimilarityCalculators/BottomUpSimilarityCalculator.cs

@@ -177 +177 @@
         if (childrenCount[p] == 0)
           queue.Enqueue(p);
-      };
+      }
 
       return nodesToVertices;

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Tests/BottomUpSimilarityCalculatorTest.cs

@@ -33 +33 @@
       TestMatchedNodes("(+ 1 2)", "(+ 2 1)", 5);
       TestMatchedNodes("(- 2 1)", "(- 1 2)", 2);
+
+      TestMatchedNodes("(* (variable 1 X1) (variable 1 X2))", "(* (+ (variable 1 X1) 1) (variable 1 X2))", 2);
+
+      TestMatchedNodes("(+ (variable 1 a) (variable 1 b))", "(+ (variable 1 a) (variable 1 a))", 1);
+      TestMatchedNodes("(+ (+ (variable 1 a) (variable 1 b)) (variable 1 b))", "(+ (* (+ (variable 1 a) (variable 1 b)) (variable 1 b)) (+ (+ (variable 1 a) (variable 1 b)) (variable 1 b)))", 5);
 
       TestMatchedNodes(