Changeset 15746 for branches/2886_SymRegGrammarEnumeration/Test/GrammarEnumerationTest.cs

Timestamp:

02/09/18 15:32:44 (7 years ago)

Author:

lkammere

Message:

#2886: Refactor grammar enumeration alg.

File:

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

branches/2886_SymRegGrammarEnumeration/Test/GrammarEnumerationTest.cs

@@ -1 +1 @@
 using System;
+using System.Diagnostics;
 using System.Linq;
 using HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration;
@@ -24 +25 @@
     [TestInitialize]
     public void InitTest() {
-      Console.Write("init called... ");
       rand = new FastRandom(Seed);
 
@@ -33 +33 @@
     }
 
-    [TestCleanup()]
+    [TestCleanup]
     public void Cleanup() {
       if (alg.BestTrainingSentence != null) {
         Console.WriteLine("Training: " + alg.Grammar.PostfixToInfixParser(alg.BestTrainingSentence));
       }
-      if (alg.BestTestSentence != null) {
-        Console.WriteLine("Test: " + alg.Grammar.PostfixToInfixParser(alg.BestTestSentence));
-      }
     }
 
@@ -49 +46 @@
 
       // Check if algorithm terminated correctly
-      Assert.IsTrue(alg.Results.ContainsKey("Best solution quality (training)"), "No training solution returned!");
-      Assert.IsTrue(alg.Results.ContainsKey("Best solution quality (test)"), "No test solution returned!");
+      Assert.IsTrue(alg.Results.ContainsKey("Best solution (Training)"), "No training solution returned!");
 
       // Check resultss
-      Assert.AreEqual(1.0, ((DoubleValue)alg.Results["Best solution quality (training)"].Value).Value, eps, "Training quality too low!");
-      Assert.AreEqual(1.0, ((DoubleValue)alg.Results["Best solution quality (test)"].Value).Value, eps, "Test quality too low!");
-
-      // Check overfitting
-      Assert.AreEqual(alg.Grammar.CalcHashCode(alg.BestTrainingSentence),
-                    alg.Grammar.CalcHashCode(alg.BestTestSentence),
-                    "Training and Test solution are not equal!");
+      Assert.AreEqual(1.0, ((IRegressionSolution)alg.Results["Best solution (Training)"].Value).TestRSquared, eps, "Test quality too low!");
     }
 
@@ -68 +58 @@
     public void MctsSymbReg_NoConstants_Nguyen1() {
       // x³ + x² + x
-      alg.MaxTreeSize = 3;
+      alg.MaxTreeSize = 15;
       Console.WriteLine(alg.MaxTreeSize);
       var provider = new HeuristicLab.Problems.Instances.DataAnalysis.NguyenInstanceProvider(Seed);
@@ -75 +65 @@
 
       alg.Start();
-
-      // Evaluate
-      // EvaluateGrammarEnumeration();
 
       TerminalSymbol varSymbol = alg.Grammar.Var.VariableTerminalSymbols.First();
@@ -90 +77 @@
 
       int targetSolutionHash = alg.Grammar.CalcHashCode(targetSolution);
-      int actualSolutionHash = alg.Grammar.CalcHashCode(alg.BestTestSentence);
-
-      Assert.IsTrue(alg.distinctSentences.Select(tuple => tuple.Item2).Contains(actualSolutionHash));
-
-      // last because long sentences are overwritten by short ones.
-      Console.WriteLine(alg.Grammar.PostfixToInfixParser(alg.distinctSentences.Last(tuple => tuple.Item2 == targetSolutionHash).Item1));
-
-
-      Assert.AreEqual(targetSolutionHash, actualSolutionHash);
+      int actualSolutionHash = alg.Grammar.CalcHashCode(alg.BestTrainingSentence);
+
+      Assert.IsTrue(alg.DistinctSentences.ContainsKey(actualSolutionHash), "Actual solution was not generated!");
+
+      Assert.AreEqual(targetSolutionHash, actualSolutionHash, "Actual solution was not recognized as best one.");
+
+      // Evaluate
+      EvaluateGrammarEnumeration();
     }
 
@@ -105 +91 @@
     public void MctsSymbReg_NoConstants_Nguyen2() {
       // x^4 + x³ + x² + x
-      alg.MaxTreeSize = 30;
+      alg.MaxTreeSize = 25;
       var provider = new HeuristicLab.Problems.Instances.DataAnalysis.NguyenInstanceProvider(Seed);
       var regProblem = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name.Contains("F2 ")));
@@ -111 +97 @@
 
       alg.Start();
+
+      TerminalSymbol varSymbol = alg.Grammar.Var.VariableTerminalSymbols.First();
+      TerminalSymbol mulSymbol = alg.Grammar.Multiplication;
+      TerminalSymbol addSymbol = alg.Grammar.Addition;
+
+      SymbolString targetSolution = new SymbolString(new[] {
+        varSymbol, varSymbol, varSymbol, varSymbol, mulSymbol, mulSymbol, mulSymbol,
+        varSymbol, varSymbol, varSymbol, mulSymbol, mulSymbol, addSymbol,
+        varSymbol, varSymbol, mulSymbol, addSymbol,
+        varSymbol, addSymbol
+      });
+
+      int targetSolutionHash = alg.Grammar.CalcHashCode(targetSolution);
+      int actualSolutionHash = alg.Grammar.CalcHashCode(alg.BestTrainingSentence);
+
+      var targetSolutionStr = alg.Grammar.PostfixToInfixParser(targetSolution).ToString();
+      var foundTargetSolutionStr = alg.Grammar.PostfixToInfixParser(alg.DistinctSentences[targetSolutionHash]).ToString();
+      var actualSolutionStr = alg.Grammar.PostfixToInfixParser(alg.DistinctSentences[targetSolutionHash]).ToString();
+
+      Assert.IsTrue(alg.DistinctSentences.ContainsKey(targetSolutionHash), "Target solution was not generated!");
+
+      Assert.AreEqual(targetSolutionHash, actualSolutionHash, "Actual solution was not recognized as best one.");
 
       // Evaluate
@@ -126 +134 @@
       alg.Start();
 
-      Assert.AreEqual(alg.distinctSentences.Count(), 110);
+      Assert.AreEqual(alg.DistinctSentences.Count(), 110);
 
       // Evaluate
@@ -142 +150 @@
       alg.Start();
 
-      Assert.AreEqual(alg.distinctSentences.Count(), 16);
+      Assert.AreEqual(alg.DistinctSentences.Count(), 16);
 
       // Evaluate