Changeset 11895 for branches/HeuristicLab.Problems.GrammaticalOptimization/Test

Timestamp:

02/05/15 07:03:15 (10 years ago)

Author:

gkronber

Message:

#2283: constant opt, expressioncompiler, autodiff, fixes in GP solvers

Location:

branches/HeuristicLab.Problems.GrammaticalOptimization/Test

Files:

• TestSolvers.cs (modified) (3 diffs)
• TestSymbRegInstances.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/Test/TestSolvers.cs

@@ -2 +2 @@
 using HeuristicLab.Algorithms.GeneticProgramming;
 using HeuristicLab.Algorithms.GrammaticalOptimization;
+using HeuristicLab.Problems.GrammaticalOptimization.SymbReg;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -154 +155 @@
 
     [TestMethod]
-    public void TestOSGP() {
-      var prob = new SymbolicRegressionPoly10Problem();
+    public void TestOSGP()
+    {
+      const int seed = 31415;
+      var prob = new SymbolicRegressionProblem(new Random(seed), "Tower");
       var rand = new Random(31415);
       var osgp = new OffspringSelectionGP(prob, rand);
-      osgp.PopulationSize = 1000;
-      osgp.MaxSolutionSize = 50;
+      osgp.PopulationSize = 500;
+      osgp.MaxSolutionSize = 100;
       osgp.MaxSolutionDepth = 20;
 
@@ -166 +169 @@
 
       osgp.FoundNewBestSolution += (sentence, quality) => {
-        Assert.Inconclusive(string.Format("{0:N3} {1}", quality, sentence));
+        // Assert.Inconclusive(string.Format("{0:N3} {1}", quality, sentence));
         bestSentence = sentence;
         bestQuality = quality;

branches/HeuristicLab.Problems.GrammaticalOptimization/Test/TestSymbRegInstances.cs

@@ -1 +1 @@
 using System;
 using System.Linq;
+using HeuristicLab.Algorithms.GeneticProgramming;
 using HeuristicLab.Algorithms.GrammaticalOptimization;
 using HeuristicLab.Problems.GrammaticalOptimization.SymbReg;
@@ -13 +14 @@
 
       var problem = new SymbolicRegressionProblem(new Random(), "Tower");
-
+      double r2;
+      Assert.AreEqual(problem.Evaluate("a*b"), problem.OptimizeConstantsAndEvaluate("a*b"));
+      Assert.AreEqual(problem.OptimizeConstantsAndEvaluate("a*b"), problem.Evaluate("a*b"));
+      Assert.AreEqual(problem.OptimizeConstantsAndEvaluate("0*a*b"), problem.Evaluate("a*b"), 1E-6);
+      Assert.AreEqual(problem.OptimizeConstantsAndEvaluate("0*a*b+1"), problem.Evaluate("a*b"), 1E-6);
+      Assert.IsTrue(problem.OptimizeConstantsAndEvaluate("0*a+b") >= problem.Evaluate("a+b"));
+      Assert.AreEqual(problem.OptimizeConstantsAndEvaluate("0*a+0*b"), problem.Evaluate("a+b"), 1E-6);
+      Assert.IsTrue(problem.OptimizeConstantsAndEvaluate("0*a+1*b") >= problem.Evaluate("a+b"));
     }
   }