Changeset 11730 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization.Test/TestInstances.cs

Timestamp:

01/02/15 16:08:21 (9 years ago)

Author:

gkronber

Message:

#2283: several major extensions for grammatical optimization

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization.Test/TestInstances.cs (modified) (5 diffs)

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

@@ -27 +27 @@
         Assert.AreEqual(2, g.GetAlternatives('B').Count());
 
-        Assert.IsTrue(g.GetAlternatives('S').Contains("aA"));
-        Assert.IsTrue(g.GetAlternatives('S').Contains("bB"));
-        Assert.IsTrue(g.GetAlternatives('A').Contains("aA"));
-        Assert.IsTrue(g.GetAlternatives('A').Contains("a"));
-        Assert.IsTrue(g.GetAlternatives('B').Contains("Bb"));
-        Assert.IsTrue(g.GetAlternatives('B').Contains("b"));
-
-        Assert.AreEqual(2, g.MinPhraseLength("S"));
-        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength("S"));
-        Assert.AreEqual(1, g.MinPhraseLength("A"));
-        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength("A"));
-        Assert.AreEqual(1, g.MinPhraseLength("B"));
-        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength("B"));
+        Assert.IsTrue(g.GetAlternatives('S').Any(s => s.ToString() == "aA"));
+        Assert.IsTrue(g.GetAlternatives('S').Any(s => s.ToString() == "bB"));
+        Assert.IsTrue(g.GetAlternatives('A').Any(s => s.ToString() == "aA"));
+        Assert.IsTrue(g.GetAlternatives('A').Any(s => s.ToString() == "a"));
+        Assert.IsTrue(g.GetAlternatives('B').Any(s => s.ToString() == "Bb"));
+        Assert.IsTrue(g.GetAlternatives('B').Any(s => s.ToString() == "b"));
+
+        Assert.AreEqual(2, g.MinPhraseLength(new Sequence("S")));
+        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength(new Sequence("S")));
+        Assert.AreEqual(1, g.MinPhraseLength(new Sequence("A")));
+        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength(new Sequence("A")));
+        Assert.AreEqual(1, g.MinPhraseLength(new Sequence("B")));
+        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength(new Sequence("B")));
       }
 
@@ -56 +56 @@
         Assert.AreEqual(1, g.GetAlternatives('S').Count());
 
-        Assert.IsTrue(g.GetAlternatives('S').Contains("sS"));
-
-        Assert.AreEqual(short.MaxValue, g.MinPhraseLength("S"));
-        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength("S"));
+        Assert.IsTrue(g.GetAlternatives('S').Any(s => s.ToString() == "sS"));
+
+        Assert.AreEqual(short.MaxValue, g.MinPhraseLength(new Sequence("S")));
+        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength(new Sequence("S")));
       }
 
@@ -75 +75 @@
         Assert.AreEqual(2, g.GetAlternatives('S').Count());
 
-        Assert.IsTrue(g.GetAlternatives('S').Contains("sss"));
-        Assert.IsTrue(g.GetAlternatives('S').Contains("sS"));
-
-        Assert.AreEqual(3, g.MinPhraseLength("S"));
-        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength("S"));
-        Assert.AreEqual(4, g.MinPhraseLength("sS"));
-        Assert.AreEqual(7, g.MinPhraseLength("sSS"));
-        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength("sSS"));
-        Assert.AreEqual(3, g.MaxPhraseLength("sss"));
-        Assert.AreEqual(3, g.MinPhraseLength("sss"));
+        Assert.IsTrue(g.GetAlternatives('S').Any(s => s.ToString() == "sss"));
+        Assert.IsTrue(g.GetAlternatives('S').Any(s => s.ToString() == "sS"));
+
+        Assert.AreEqual(3, g.MinPhraseLength(new Sequence("S")));
+        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength(new Sequence("S")));
+        Assert.AreEqual(4, g.MinPhraseLength(new Sequence("sS")));
+        Assert.AreEqual(7, g.MinPhraseLength(new Sequence("sSS")));
+        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength(new Sequence("sSS")));
+        Assert.AreEqual(3, g.MaxPhraseLength(new Sequence("sss")));
+        Assert.AreEqual(3, g.MinPhraseLength(new Sequence("sss")));
       }
 
@@ -101 +101 @@
         Assert.AreEqual(2, g.GetAlternatives('S').Count());
 
-        Assert.IsTrue(g.GetAlternatives('S').Contains("T"));
-        Assert.IsTrue(g.GetAlternatives('S').Contains("TS"));
-
-        Assert.AreEqual(1, g.MinPhraseLength("S"));
-        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength("S"));
-        Assert.AreEqual(1, g.MinPhraseLength("T"));
-        Assert.AreEqual(1, g.MaxPhraseLength("T"));
+        Assert.IsTrue(g.GetAlternatives('S').Any(s => s.ToString() == "T"));
+        Assert.IsTrue(g.GetAlternatives('S').Any(s => s.ToString() == "TS"));
+
+        Assert.AreEqual(1, g.MinPhraseLength(new Sequence("S")));
+        Assert.AreEqual(short.MaxValue, g.MaxPhraseLength(new Sequence("S")));
+        Assert.AreEqual(1, g.MinPhraseLength(new Sequence("T")));
+        Assert.AreEqual(1, g.MaxPhraseLength(new Sequence("T")));
       }
 
@@ -247 +247 @@
 
       Assert.AreEqual(0.252718466940018, p.Evaluate("a*b"), 1.0E-7);
+      Assert.AreEqual(0.290635611728845, p.Evaluate("c*d"), 1.0E-7);
+      Assert.AreEqual(0.25737325167716, p.Evaluate("e*f"), 1.0E-7);
+
       Assert.AreEqual(0.00173739472363473, p.Evaluate("b*c"), 1.0E-7);
       Assert.AreEqual(3.15450564064128E-05, p.Evaluate("d*e"), 1.0E-7);
 
+      Assert.AreEqual(0.0943358163760454, p.Evaluate("a*g*i"), 1.0E-7);
+      Assert.AreEqual(0.116199534934045, p.Evaluate("c*f*j"), 1.0E-7);
+
+
       Assert.AreEqual(1.0, p.Evaluate("a*b+c*d+e*f+a*g*i+c*f*j"), 1.0E-7);
     }