Changeset 15734 for branches/2886_SymRegGrammarEnumeration/Test/GrammarEnumerationTest.cs

Timestamp:

02/07/18 17:30:02 (6 years ago)

Author:

gkronber

Message:

#2886 worked on grammar enumeration

Location:

branches/2886_SymRegGrammarEnumeration

Files:

• . (modified) (1 prop)
• Test/GrammarEnumerationTest.cs (modified) (3 diffs)

branches/2886_SymRegGrammarEnumeration/Test/GrammarEnumerationTest.cs

@@ -68 +68 @@
     public void MctsSymbReg_NoConstants_Nguyen1() {
       // x³ + x² + x
-      alg.MaxTreeSize = 30;
+      alg.MaxTreeSize = 3;
       Console.WriteLine(alg.MaxTreeSize);
       var provider = new HeuristicLab.Problems.Instances.DataAnalysis.NguyenInstanceProvider(Seed);
@@ -92 +92 @@
       int actualSolutionHash = alg.Grammar.CalcHashCode(alg.BestTestSentence);
 
-      Assert.IsTrue(alg.DistinctGenerated.Select(tuple => tuple.Item2).Contains(actualSolutionHash));
+      Assert.IsTrue(alg.distinctSentences.Select(tuple => tuple.Item2).Contains(actualSolutionHash));
 
       // last because long sentences are overwritten by short ones.
-      Console.WriteLine(alg.Grammar.PostfixToInfixParser(alg.DistinctGenerated.Last(tuple => tuple.Item2 == targetSolutionHash).Item1));
+      Console.WriteLine(alg.Grammar.PostfixToInfixParser(alg.distinctSentences.Last(tuple => tuple.Item2 == targetSolutionHash).Item1));
 
 
@@ -114 +114 @@
       // Evaluate
       EvaluateGrammarEnumeration();
+    }
+
+    [TestMethod]
+    [TestProperty("Goal", "structure search")]
+    public void MctsSymbReg_NoConstants_Poly10() {
+      alg.MaxTreeSize = 10;
+      var provider = new HeuristicLab.Problems.Instances.DataAnalysis.VariousInstanceProvider(Seed);
+      var regProblem = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name.Contains("Poly")));
+      alg.Problem.ProblemData = regProblem;
+
+      alg.Start();
+
+      Assert.AreEqual(alg.distinctSentences.Count(), 110);
+
+      // Evaluate
+      // EvaluateGrammarEnumeration();
+    }
+
+    [TestMethod]
+    [TestProperty("Goal", "structure search")]
+    public void MctsSymbReg_NoConstants_15() {
+      alg.MaxTreeSize = 5;
+      var provider = new HeuristicLab.Problems.Instances.DataAnalysis.KeijzerInstanceProvider(Seed);
+      var regProblem = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name.Contains("15")));
+      alg.Problem.ProblemData = regProblem;
+
+      alg.Start();
+
+      Assert.AreEqual(alg.distinctSentences.Count(), 16);
+
+      // Evaluate
+      // EvaluateGrammarEnumeration();
     }