Changeset 15861 for branches/2886_SymRegGrammarEnumeration/Test

Timestamp:

03/23/18 18:57:36 (7 years ago)

Author:

lkammere

Message:

#2886: Make constant optimization toggleable in algorithm.

File:

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

branches/2886_SymRegGrammarEnumeration/Test/GrammarEnumerationTest.cs

@@ -60 +60 @@
     public void NoConstants_Nguyen1() {
       // x³ + x² + x
+      alg.OptimizeConstants = false;
       alg.MaxComplexity = 6;
       alg.Problem.ProblemData = new NguyenFunctionOne(Seed).GenerateRegressionData();
@@ -117 +118 @@
     public void NoConstants_Nguyen6() {
       // sin(x) + sin(x + x²)
+      alg.OptimizeConstants = false;
       alg.MaxComplexity = 4;
       alg.Problem.ProblemData = new NguyenFunctionSix(Seed).GenerateRegressionData();
@@ -147 +149 @@
     [TestProperty("Goal", "structure search")]
     public void NoConstants_Nguyen9() {
-      // sin(x) + sin(y²)
+      // sin(x) + sin(y²)    
+      alg.OptimizeConstants = false;
       alg.MaxComplexity = 3;
       alg.Problem.ProblemData = new NguyenFunctionNine(Seed).GenerateRegressionData();
@@ -190 +193 @@
     [TestProperty("Goal", "structure search")]
     public void NoConstants_Inverse() {
-      // x / (log(x)*x + x)
+      // x / (log(x)*x + x) 
+      alg.OptimizeConstants = false;
       alg.MaxComplexity = 4;