Changeset 15776

Timestamp:

02/14/18 10:56:02 (7 years ago)

Author:

lkammere

Message:

#2886: Refactor data generation in unit tests.

Location:

branches/2886_SymRegGrammarEnumeration

Files:

• HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/GrammarEnumerationAlgorithm.cs (modified) (1 diff)
• Test/GrammarEnumerationTest.cs (modified) (7 diffs)

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/GrammarEnumerationAlgorithm.cs

@@ -84 +84 @@
 
     public GrammarEnumerationAlgorithm() {
-      var provider = new HeuristicLab.Problems.Instances.DataAnalysis.VariousInstanceProvider(seed: 1234);
-      var regProblem = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name.Contains("Poly-10")));
+      var provider = new HeuristicLab.Problems.Instances.DataAnalysis.NguyenInstanceProvider(seed: 1234);
+      var regProblem = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name.Contains("F9 ")));
 
       Problem = new RegressionProblem() {

branches/2886_SymRegGrammarEnumeration/Test/GrammarEnumerationTest.cs

@@ -1 +1 @@
 using System;
-using System.Diagnostics;
 using System.Linq;
 using HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration;
 using HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration.GrammarEnumeration;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
+using HeuristicLab.Problems.Instances.DataAnalysis;
 using HeuristicLab.Random;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -58 +55 @@
       // x³ + x² + x
       alg.MaxTreeSize = 15;
-      Console.WriteLine(alg.MaxTreeSize);
-      var provider = new HeuristicLab.Problems.Instances.DataAnalysis.NguyenInstanceProvider(Seed);
-      var regProblem = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name.Contains("F1 ")));
-      alg.Problem.ProblemData = regProblem;
+      alg.Problem.ProblemData = new NguyenFunctionOne(Seed).GenerateRegressionData(); 
 
       alg.Start();
@@ -92 +86 @@
       // x^4 + x³ + x² + x
       alg.MaxTreeSize = 20;
-      var provider = new HeuristicLab.Problems.Instances.DataAnalysis.NguyenInstanceProvider(Seed);
-      var regProblem = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name.Contains("F2 ")));
-      alg.Problem.ProblemData = regProblem;
+      alg.Problem.ProblemData = new NguyenFunctionTwo(Seed).GenerateRegressionData();
 
       alg.Start();
@@ -106 +98 @@
       // x^5 + x^4 + x^3 + x^2 + x
       alg.MaxTreeSize = 32;
-      var provider = new HeuristicLab.Problems.Instances.DataAnalysis.NguyenInstanceProvider(Seed);
-      var regProblem = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name.Contains("F3 ")));
-      alg.Problem.ProblemData = regProblem;
+      alg.Problem.ProblemData = new NguyenFunctionThree(Seed).GenerateRegressionData();
 
       alg.Start();
@@ -120 +110 @@
       // sin(x) + sin(x + x²)
       alg.MaxTreeSize = 15;
-      var provider = new HeuristicLab.Problems.Instances.DataAnalysis.NguyenInstanceProvider(Seed);
-      var regProblem = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name.Contains("F6 ")));
-      alg.Problem.ProblemData = regProblem;
+      alg.Problem.ProblemData = new NguyenFunctionSix(Seed).GenerateRegressionData();
 
       alg.Start();
@@ -133 +121 @@
       // sin(x) + sin(y²)
       alg.MaxTreeSize = 10;
-      var provider = new HeuristicLab.Problems.Instances.DataAnalysis.NguyenInstanceProvider(Seed);
-      var regProblem = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name.Contains("F9 ")));
-      alg.Problem.ProblemData = regProblem;
+      alg.Problem.ProblemData = new NguyenFunctionNine(Seed).GenerateRegressionData();
 
       alg.Start();
@@ -146 +132 @@
     public void MctsSymbReg_NoConstants_Poly10() {
       alg.MaxTreeSize = 10;
-      var provider = new HeuristicLab.Problems.Instances.DataAnalysis.VariousInstanceProvider(Seed);
-      var regProblem = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name.Contains("Poly")));
-      alg.Problem.ProblemData = regProblem;
+      alg.Problem.ProblemData = new PolyTen(Seed).GenerateRegressionData();
 
       alg.Start();