Changeset 11966 for branches/HeuristicLab.Problems.GrammaticalOptimization/Test

Timestamp:

02/06/15 19:45:12 (10 years ago)

Author:

gkronber

Message:

worked on expression expander for const opt

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization/Test/TestCanonicalExpressions.cs (modified) (3 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/Test/TestCanonicalExpressions.cs

@@ -62 +62 @@
 
       // when using constant opt the negative sign is not necessary because a negative factor can be produced
-      Assert.AreEqual("a*b+c*b", extender.CanonicalRepresentation("b*(c-a)"));
+      Assert.AreEqual("a*b+b*c", extender.CanonicalRepresentation("b*(c-a)"));
       Assert.AreEqual("a*b+a*d+b*c+c*d", extender.CanonicalRepresentation("(b-d)*(c-a)"));
     }
@@ -74 +74 @@
 
       Assert.AreEqual("a*b%(a+b)%(c+d)", extender.CanonicalRepresentation("(b*a)%(d-c)%(a+b)"));
-      Assert.AreEqual("a*b%(c+d)%(a%e+b%e)", extender.CanonicalRepresentation("((b*a)%(d-c))%((a+b)%e)"));
+      Assert.AreEqual("a*b%(a%e+b%e)%(c+d)", extender.CanonicalRepresentation("((b*a)%(d-c))%((a+b)%e)"));
       // a*b*e%(c+d)%(a+b)
     }
@@ -80 +80 @@
     public void TestDivisionCancellation() {
       var extender = new ExpressionExtender();
-      Assert.AreEqual("a", extender.CanonicalRepresentation("a%a"));
-      Assert.AreEqual("a*a", extender.CanonicalRepresentation("a*a%a"));
-      Assert.AreEqual("1%a", extender.CanonicalRepresentation("(a%a)%a"));
+      Assert.AreEqual("1", extender.CanonicalRepresentation("a%a"));
+      Assert.AreEqual("a", extender.CanonicalRepresentation("a*a%a"));
+      Assert.AreEqual("1%a", extender.CanonicalRepresentation("(a%a)%a")); 
       Assert.AreEqual("1%a", extender.CanonicalRepresentation("a%a%a"));
       Assert.AreEqual("a", extender.CanonicalRepresentation("a%(a%a)"));
+      Assert.AreEqual("1", extender.CanonicalRepresentation("(a+b)%(b+a)"));
+      Assert.AreEqual("1%a+1%b", extender.CanonicalRepresentation("(a+b)%(a*b)"));
     }
   }