Changeset 15784 for branches/2886_SymRegGrammarEnumeration/Test

Timestamp:

02/16/18 18:36:17 (7 years ago)

Author:

lkammere

Message:

#2886: Add basic implementation for inverse factors.

Location:

branches/2886_SymRegGrammarEnumeration/Test

Files:

• GrammarEnumerationTest.cs (modified) (7 diffs)
• TreeHashingTest.cs (modified) (1 diff)

branches/2886_SymRegGrammarEnumeration/Test/GrammarEnumerationTest.cs

@@ -1 +1 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration;
 using HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration.GrammarEnumeration;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Problems.DataAnalysis;
@@ -52 +55 @@
     [TestMethod]
     [TestProperty("Goal", "structure search")]
-    public void MctsSymbReg_NoConstants_Nguyen1() {
+    public void NoConstants_Nguyen1() {
       // x³ + x² + x
-      alg.MaxTreeSize = 15;
-      alg.Problem.ProblemData = new NguyenFunctionOne(Seed).GenerateRegressionData(); 
+      alg.MaxTreeSize = 12;
+      alg.Problem.ProblemData = new NguyenFunctionOne(Seed).GenerateRegressionData();
 
       alg.Start();
@@ -83 +86 @@
     //[TestMethod]
     [TestProperty("Goal", "structure search")]
-    public void MctsSymbReg_NoConstants_Nguyen2() {
+    public void NoConstants_Nguyen2() {
       // x^4 + x³ + x² + x
       alg.MaxTreeSize = 20;
@@ -95 +98 @@
     //[TestMethod]
     [TestProperty("Goal", "structure search")]
-    public void MctsSymbReg_NoConstants_Nguyen3() {
+    public void NoConstants_Nguyen3() {
       // x^5 + x^4 + x^3 + x^2 + x
       alg.MaxTreeSize = 32;
@@ -105 +108 @@
     }
 
-    [TestMethod]                              
-    [TestProperty("Goal", "structure search")]
-    public void MctsSymbReg_NoConstants_Nguyen6() {
+    [TestMethod]
+    [TestProperty("Goal", "structure search")]
+    public void NoConstants_Nguyen6() {
       // sin(x) + sin(x + x²)
-      alg.MaxTreeSize = 15;
+      alg.MaxTreeSize = 13;
       alg.Problem.ProblemData = new NguyenFunctionSix(Seed).GenerateRegressionData();
 
       alg.Start();
-      EvaluateGrammarEnumeration();
-    }
-
-    [TestMethod]
-    [TestProperty("Goal", "structure search")]
-    public void MctsSymbReg_NoConstants_Nguyen9() {
+
+      TerminalSymbol varSymbol = alg.Grammar.Var.VariableTerminalSymbols.First();
+      TerminalSymbol mulSymbol = alg.Grammar.Multiplication;
+      TerminalSymbol addSymbol = alg.Grammar.Addition;
+      TerminalSymbol sinSymbol = alg.Grammar.Sin;
+
+      SymbolString targetSolution = new SymbolString(new[] {
+        varSymbol, sinSymbol,
+        varSymbol, varSymbol, mulSymbol, varSymbol, addSymbol, sinSymbol, addSymbol
+      });
+
+      int targetSolutionHash = alg.Grammar.CalcHashCode(targetSolution);
+      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.");
+
+      EvaluateGrammarEnumeration();
+    }
+
+    [TestMethod]
+    [TestProperty("Goal", "structure search")]
+    public void NoConstants_Nguyen9() {
       // sin(x) + sin(y²)
       alg.MaxTreeSize = 10;
@@ -133 +154 @@
       alg.MaxTreeSize = 10;
       alg.Problem.ProblemData = new PolyTen(Seed).GenerateRegressionData();
+
+      alg.Start();
+      EvaluateGrammarEnumeration();
+    }
+
+    [TestMethod]
+    [TestProperty("Goal", "structure search")]
+    public void NoConstants_Inverse() {
+      // 1 / (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();
+      alg.Problem.ProblemData = new RegressionProblemData(new Dataset(new List<string>() { "x", "y" }, new List<IList>() { x, y }), "x".ToEnumerable(), "y");
 
       alg.Start();
@@ -210 +245 @@
       var ys = ds.GetDoubleValues("Y").ToArray();
       var x1 = ds.GetDoubleValues("X1").ToArray();
-      var x2 = ds.GetDoubleValues("X2").ToArray();
+      var x2 = ds.GetDoubleValues("X2").ToArray();                                           
       var x3 = ds.GetDoubleValues("X3").ToArray();
       var x4 = ds.GetDoubleValues("X4").ToArray();

branches/2886_SymRegGrammarEnumeration/Test/TreeHashingTest.cs

@@ -106 +106 @@
     }
 
+    [TestMethod]
+    [TestCategory("TreeHashing")]
+    public void InverseFactorCancelationSimple() {
+      SymbolString s1 = new SymbolString(new Symbol[] { varA, grammar.Inv, varB, grammar.Multiplication, varA, grammar.Multiplication, varA, grammar.Multiplication });
+      SymbolString s2 = new SymbolString(new Symbol[] { varA, varB, grammar.Multiplication });
+
+      int hash1 = grammar.CalcHashCode(s1);
+      int hash2 = grammar.CalcHashCode(s2);
+
+      Assert.AreEqual(hash1, hash2);
+    }
+
+    [TestMethod]
+    [TestCategory("TreeHashing")]
+    public void InverseFactorCancelationComplex() {
+      SymbolString s1 = new SymbolString(new Symbol[] { varA, grammar.Sin, varA, varA, grammar.Multiplication, varA, grammar.Addition, grammar.Sin, grammar.Addition });
+      SymbolString s2 = new SymbolString(new Symbol[] { varA, varA, varA, grammar.Multiplication, grammar.Addition, grammar.Sin, varA, grammar.Inv, varA, grammar.Sin, varA, grammar.Multiplication, grammar.Multiplication, grammar.Addition });
+
+      int hash1 = grammar.CalcHashCode(s1);
+      int hash2 = grammar.CalcHashCode(s2);
+
+      Assert.AreEqual(hash1, hash2);
+    }
 
     #region parser