Changeset 15915 for branches/2886_SymRegGrammarEnumeration/Test

Timestamp:

04/24/18 13:11:59 (6 years ago)

Author:

lkammere

Message:

#2886: Add separate data structure for storing phrases in the queue.

File:

• branches/2886_SymRegGrammarEnumeration/Test/GrammarEnumerationTest.cs (modified) (6 diffs)

branches/2886_SymRegGrammarEnumeration/Test/GrammarEnumerationTest.cs

@@ -210 +210 @@
     public void Constants_Nguyen7() {
       // log(x+1) + log(x*x + 1)
-      alg.MaxComplexity = 3;
+      alg.MaxComplexity = 4;
+      alg.OptimizeConstants = true;
       alg.Problem.ProblemData = new NguyenFunctionSeven().GenerateRegressionData();
 
@@ -242 +243 @@
       // x*x*x*x - x*x*x + y*y/2 -y
       alg.MaxComplexity = 10;
+      alg.OptimizeConstants = true;
       alg.Problem.ProblemData = new NguyenFunctionTwelve().GenerateRegressionData();
 
@@ -286 +288 @@
       // (30*x*z) / ((x - 10)*y*y)
       alg.MaxComplexity = 5;
+      alg.OptimizeConstants = true;
       alg.Problem.ProblemData = new KeijzerFunctionFive().GenerateRegressionData();
 
@@ -357 +360 @@
     [TestProperty("Goal", "structure search + const op")]
     public void Constants_Keijzer14() {
-      // 8 / (2 + x*x + y*y
+      // 8 / (2 + x*x + y*y)
       alg.MaxComplexity = 4;
+      alg.OptimizeConstants = true;
       alg.Problem.ProblemData = new KeijzerFunctionFourteen().GenerateRegressionData();
 
@@ -396 +400 @@
       // x*x*x / 5 + y*y*y / 2 - y - x
       alg.MaxComplexity = 8;
+      alg.OptimizeConstants = true;
       alg.Problem.ProblemData = new KeijzerFunctionFifteen().GenerateRegressionData();
 
@@ -428 +433 @@
     [TestProperty("Goal", "Poly-10 derivatives")]
     public void MctsSymbReg_NoConstants_Poly10_Part1() {
-      alg.MaxComplexity = 12; 
+      alg.MaxComplexity = 12;
       alg.OptimizeConstants = false;
       var regProblem = new PolyTen(123).GenerateRegressionData();