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

Timestamp:

02/20/18 13:43:36 (7 years ago)

Author:

lkammere

Message:

#2886: Replace integer hashing of phrases with simplification to (temporary) string representations.

File:

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

branches/2886_SymRegGrammarEnumeration/Test/GrammarEnumerationTest.cs

@@ -75 +75 @@
       int actualSolutionHash = alg.Grammar.CalcHashCode(alg.BestTrainingSentence);
 
-      Assert.IsTrue(alg.DistinctSentences.ContainsKey(actualSolutionHash), "Actual solution was not generated!");
+      Assert.IsTrue(alg.DistinctSentences.ContainsKey(targetSolutionHash), "Actual solution was not generated!");
 
       Assert.AreEqual(targetSolutionHash, actualSolutionHash, "Actual solution was not recognized as best one.");
@@ -112 +112 @@
     public void NoConstants_Nguyen6() {
       // sin(x) + sin(x + x²)
-      alg.MaxTreeSize = 13;
+      alg.MaxTreeSize = 10;
       alg.Problem.ProblemData = new NguyenFunctionSix(Seed).GenerateRegressionData();
 
@@ -130 +130 @@
       int actualSolutionHash = alg.Grammar.CalcHashCode(alg.BestTrainingSentence);
 
-      Assert.IsTrue(alg.DistinctSentences.ContainsKey(actualSolutionHash), "Actual solution was not generated!");
-
+      Assert.IsTrue(alg.DistinctSentences.ContainsKey(targetSolutionHash), "Actual solution was not generated!");
       Assert.AreEqual(targetSolutionHash, actualSolutionHash, "Actual solution was not recognized as best one.");
 
@@ -141 +140 @@
     public void NoConstants_Nguyen9() {
       // sin(x) + sin(y²)
-      alg.MaxTreeSize = 10;
+      alg.MaxTreeSize = 11;
       alg.Problem.ProblemData = new NguyenFunctionNine(Seed).GenerateRegressionData();
 
       alg.Start();
+
+      TerminalSymbol xSymbol = alg.Grammar.Var.VariableTerminalSymbols.First(v => v.StringRepresentation == "X");
+      TerminalSymbol ySymbol = alg.Grammar.Var.VariableTerminalSymbols.First(v => v.StringRepresentation == "Y");
+      TerminalSymbol mulSymbol = alg.Grammar.Multiplication;
+      TerminalSymbol addSymbol = alg.Grammar.Addition;
+      TerminalSymbol sinSymbol = alg.Grammar.Sin;
+
+      SymbolString targetSolution = new SymbolString(new[] {
+        xSymbol, sinSymbol,
+        ySymbol, ySymbol, mulSymbol, sinSymbol, addSymbol
+      });
+
+      int targetSolutionHash = alg.Grammar.CalcHashCode(targetSolution);
+      int actualSolutionHash = alg.Grammar.CalcHashCode(alg.BestTrainingSentence);
+
+      Assert.IsTrue(alg.DistinctSentences.ContainsKey(targetSolutionHash), "Actual solution was not generated!");
+      Assert.AreEqual(targetSolutionHash, actualSolutionHash, "Actual solution was not recognized as best one.");
+
       EvaluateGrammarEnumeration();
     }
@@ -162 +179 @@
     [TestProperty("Goal", "structure search")]
     public void NoConstants_Inverse() {
-      // 1 / (log(x)*x + x)
+      // sin(x) / (log(x)*x + x)
       alg.MaxTreeSize = 12;
 
       var x = Enumerable.Range(0, 100).Select(_ => rand.NextDouble() + 1.1).ToList();
-      var y = x.Select(xi => 1 / (Math.Log(xi) * xi + xi)).ToList();
+      var y = x.Select(xi => xi / (Math.Log(xi) * xi + xi)).ToList();
       alg.Problem.ProblemData = new RegressionProblemData(new Dataset(new List<string>() { "x", "y" }, new List<IList>() { x, y }), "x".ToEnumerable(), "y");