Changeset 15437 for branches/MCTS-SymbReg-2796/Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/MctsSymbolicRegressionTest.cs

Timestamp:

10/27/17 18:42:04 (7 years ago)

Author:

gkronber

Message:

#2796 comments, simplifications, reviewed tests for structure enumeration (not working)

File:

• branches/MCTS-SymbReg-2796/Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/MctsSymbolicRegressionTest.cs (modified) (4 diffs)

branches/MCTS-SymbReg-2796/Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/MctsSymbolicRegressionTest.cs

@@ -535 +535 @@
       }
       {
+        // possible solutions with max 4 variable references:
+        // without exp, log and inv
+        // x       
+        // x*x
+        // x*x*x
+        // x+x*x
+        // x+x*x*x
+        // x*x*x*x
+
+        TestMctsNumberOfSolutions(regProblem, 4, 6, allowLog: false, allowInv: false, allowExp: false);
+      }
+      {
+        // possible solutions with max 5 variable references:
+        // without exp, log and inv
+        // x       
+        // xx
+        // xxx
+        // x+xx
+        // xxxx
+        // x+xxx
+        // xxxxx 
+        // x+xxxx
+        // xx+xxx
+        TestMctsNumberOfSolutions(regProblem, 5, 9, allowLog: false, allowInv: false, allowExp: false);
+      }
+      {
         // possible solutions with max two variable references:
-        // TODO: equal terms should not be allowed (see ConstraintHandler)
         // x
-        // log(x)
+        // log(x+c)
         // exp(x)
-        // 1/x
+        // 1/(x+c)
         //              -- 4
         // x * x
-        // x * log(x)
+        // x * log(x+c)
         // x * exp(x)
-        // x * 1/x
-        // x + x                                        ?
-        // x + log(x)
+        // x * 1/(x + c)
+        // x + log(x+c)
         // x + exp(x)
-        // x + 1/x
-        //              -- 8
-        // log(x) * log(x)
-        // log(x) * exp(x)
-        // log(x) * 1/x
-        // log(x) + log(x)                              ?
-        // log(x) + exp(x)                              ?
-        // log(x) + 1/x
+        // x + 1/(x+c)
+        //              -- 7
+        // log(x + c) * log(x + c)
+        // log(x + c) * exp(x)
+        // log(x + c) * 1/(x + c)
+        // log(x + c) + log(x + c)                        // TODO
+        // log(x + c) + exp(x)
+        // log(x + c) + 1/(x+c)
         //              -- 6
-        // exp(x) * exp(x)
-        // exp(x) * 1/x
-        // exp(x) + exp(x)                              ?
-        // exp(x) + 1/x
-        //              -- 4
-        // 1/x * 1/x
-        // 1/x + 1/x                                    ?
+        // exp(x) * 1/(x+c)
+        // exp(cx) + exp(cx)                              // TODO
+        // exp(cx) + 1/(x+c)
+        //              -- 3
+        // 1/(x+c) * 1/(x+c)                              // TODO
+        // 1/(x+c) + 1/(x+c)                              // TODO
         //              -- 2
-        // log(x+x)                                     ?
         // log(x*x)
         // exp(x*x)
-        // 1/(x+x)                                      ?
-        // 1/(x*x)
-        //              -- 5
-
-
-        TestMctsNumberOfSolutions(regProblem, 2, 29);
+        // inv(x*x+c)
+        //              -- 3
+
+
+        TestMctsNumberOfSolutions(regProblem, 2, 27);
       }
       {
@@ -616 +637 @@
         //              -- 1
         TestMctsNumberOfSolutions(regProblem, 3, 2 + 7 + 13 + 3 + 2 + 1, allowLog: false, allowInv: false);
-      }
-      {
-        // possible solutions with max 4 variable references:
-        // without exp, log and inv
-        // x       
-        // x*x
-        // x+x                                             ?
-        // x*x*x
-        // x+x*x
-        // x+x+x                                           ?
-        // x*x*x*x
-        // x+x*x*x
-        // x*x+x*x                                         ?
-        // x+x+x*x                                         ?
-        // x+x+x+x                                         ?
-
-        TestMctsNumberOfSolutions(regProblem, 4, 11, allowLog: false, allowInv: false, allowExp: false);
-      }
-      {
-        // possible solutions with max 5 variable references:
-        // without exp, log and inv
-        // x       
-        // xx
-        // x+x                                             ?
-        // xxx
-        // x+xx
-        // x+x+x                                           ?
-        // xxxx
-        // x+xxx
-        // xx+xx                                           ?
-        // x+x+xx                                          ?
-        // x+x+x+x                                         ?
-        // xxxxx 
-        // x+xxxx
-        // xx+xxx
-        // x+x+xxx                                         ?
-        // x+xx+xx                                         ?
-        // x+x+x+xx                                        ?
-        // x+x+x+x+x                                       ?
-        TestMctsNumberOfSolutions(regProblem, 5, 18, allowLog: false, allowInv: false, allowExp: false);
-      }
+      }      
     }
 
@@ -1384 +1365 @@
       mctsSymbReg.ConstantOptimizationIterations = -1;
 
-      // random policy
-      // var epsPolicy = new EpsilonGreedy();
-      // epsPolicy.Eps = 1.0;
-      // mctsSymbReg.Policy = epsPolicy;
-
-      // UCB tuned
-      var ucbTuned = new UcbTuned();
-      ucbTuned.C = 1;
-      mctsSymbReg.Policy = ucbTuned;
-
 
       #endregion
@@ -1421 +1392 @@
       mctsSymbReg.Iterations = int.MaxValue; // stopping when all solutions have been enumerated
       mctsSymbReg.MaxVariableReferences = maxNumberOfVariables;
-      var ucbPolicy = new Ucb();
-      ucbPolicy.C = 1000; // essentially breadth first search
-      mctsSymbReg.Policy = ucbPolicy;
       mctsSymbReg.AllowedFactors.SetItemCheckedState(mctsSymbReg.AllowedFactors.Single(s => s.Value.StartsWith("x * y * ...")), allowProd);
       mctsSymbReg.AllowedFactors.SetItemCheckedState(mctsSymbReg.AllowedFactors.Single(s => s.Value.Contains("exp(c * x * y ...)")), allowExp);