Changeset 15907 for branches/2886_SymRegGrammarEnumeration/Test

Timestamp:

04/16/18 15:19:58 (6 years ago)

Author:

lkammere

Message:

#2886: Changes in search heuristic for solving Poly-10 problem. Adapt tree evaluation to cover non-terminal symbols.

File:

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

branches/2886_SymRegGrammarEnumeration/Test/GrammarEnumerationTest.cs

@@ -304 +304 @@
         xSymbol, ySymbol, mulSymbol, ySymbol, mulSymbol, constSymbol, mulSymbol,
         ySymbol, ySymbol, mulSymbol, constSymbol, mulSymbol, addSymbol, constSymbol, addSymbol, invSymbol,
-        constSymbol, addSymbol 
+        constSymbol, addSymbol
       });
 
@@ -339 +339 @@
         ySymbol, ySymbol, mulSymbol, constSymbol, mulSymbol, addSymbol,
         ySymbol, constSymbol, mulSymbol, addSymbol,
-        constSymbol, addSymbol 
+        constSymbol, addSymbol
       });
 
@@ -362 +362 @@
 
       alg.Start();
-      
+
       TerminalSymbol constSymbol = alg.Grammar.Const;
       TerminalSymbol xSymbol = alg.Grammar.VarTerminals.First();
@@ -370 +370 @@
       TerminalSymbol divSymbol = alg.Grammar.Inv;
 
-      
+
       // x x mul c mul y y mul c mul add const add inv const mul const add
       SymbolString targetSolution = new SymbolString(new[] {
-        xSymbol, xSymbol, mulSymbol, constSymbol, mulSymbol,  
+        xSymbol, xSymbol, mulSymbol, constSymbol, mulSymbol,
         ySymbol, ySymbol, mulSymbol, constSymbol, mulSymbol, addSymbol,
         constSymbol, addSymbol, divSymbol,
@@ -410 +410 @@
         xSymbol, xSymbol, mulSymbol, xSymbol, mulSymbol, constSymbol, mulSymbol,
         ySymbol, ySymbol, mulSymbol, ySymbol, mulSymbol, constSymbol, mulSymbol, addSymbol,
-        ySymbol, constSymbol, mulSymbol, addSymbol, 
+        ySymbol, constSymbol, mulSymbol, addSymbol,
         xSymbol, constSymbol, mulSymbol, addSymbol,
         constSymbol, addSymbol
@@ -422 +422 @@
 
       // Evaluate
+      EvaluateGrammarEnumeration();
+    }
+
+    [TestMethod]
+    [TestProperty("Goal", "Poly-10 derivatives")]
+    public void MctsSymbReg_NoConstants_Poly10_Part1() {
+      alg.MaxComplexity = 12; 
+      alg.OptimizeConstants = false;
+      var regProblem = new PolyTen(123).GenerateRegressionData();
+
+      //  Y = X1*X2 + X3*X4 + X5*X6 + X1*X7*X9 + X3*X6*X10
+      //  Y' = X1*X2 + X3*X4 + X5*X6
+      // simplify problem by changing target
+      var ds = ((Dataset)regProblem.Dataset).ToModifiable();
+      var ys = ds.GetDoubleValues("Y").ToArray();
+      var x1 = ds.GetDoubleValues("X1").ToArray();
+      var x2 = ds.GetDoubleValues("X2").ToArray();
+      var x3 = ds.GetDoubleValues("X3").ToArray();
+      var x4 = ds.GetDoubleValues("X4").ToArray();
+      var x5 = ds.GetDoubleValues("X5").ToArray();
+      var x6 = ds.GetDoubleValues("X6").ToArray();
+      var x7 = ds.GetDoubleValues("X7").ToArray();
+      var x8 = ds.GetDoubleValues("X8").ToArray();
+      var x9 = ds.GetDoubleValues("X9").ToArray();
+      var x10 = ds.GetDoubleValues("X10").ToArray();
+      for (int i = 0; i < ys.Length; i++) {
+        //ys[i] -= x1[i] * x7[i] * x9[i];
+        //ys[i] -= x3[i] * x6[i] * x10[i];
+      }
+      ds.ReplaceVariable("Y", ys.ToList());
+
+      alg.Problem.ProblemData = new RegressionProblemData(ds, regProblem.AllowedInputVariables, regProblem.TargetVariable);
+
+      alg.Start();
+
       EvaluateGrammarEnumeration();
     }