Changeset 8463 for trunk/sources/HeuristicLab.Tests

Timestamp:

08/09/12 16:32:44 (12 years ago)

Author:

gkronber

Message:

#1902 improved GPR implementation

Location:

trunk/sources/HeuristicLab.Tests

Files:

• HeuristicLab.Algorithms.DataAnalysis-3.4/GaussianProcessFunctionsTest.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis-3.4/GaussianProcessModelTest.cs (added)
• HeuristicLab.Algorithms.DataAnalysis-3.4/GaussianProcessRegressionTest.cs (moved) (moved from trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/GaussianProcessRegressionTest.cs) (2 diffs)
• HeuristicLab.Algorithms.DataAnalysis-3.4/co2.txt (added)
• HeuristicLab.Tests.csproj (modified) (3 diffs)

trunk/sources/HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/GaussianProcessFunctionsTest.cs

@@ -123 +123 @@
       );
 
-      //      prod.Factors.Clear();
-      //      prod.Factors.Add(new MeanConst());
-      //      prod.Factors.Add(new MeanLinear());
-      //      TestMeanFunction(prod, 1,
-      //  new double[] { 2.9087, 1.8646, 3.1971, 1.9889, 1.7639, 1.2801, 2.8059, 3.7243, 3.1901, 1.4979 },
-      //  new double[][]
-      //          {
-      //            new double[] { 1.8436,    2.1279,    3.1166,    1.6886,    3.2505,    2.9613,    2.3260,    1.7293,   1.7697,    2.3982 },
-      //            new double[] { 0.6443,    0.3786,    0.8116,    0.5328,    0.3507,    0.9390,    0.8759,    0.5502,   0.6225,    0.5870 },
-      //            new double[] { 0.2077,    0.3012,    0.4709,    0.2305,    0.8443,    0.1948,    0.2259,    0.1707,   0.2277,    0.4357 },
-      //            new double[] { 0.3111,    0.9234,    0.4302,    0.1848,    0.9049,    0.9797,    0.4389,    0.1111,   0.2581,    0.4087 },
-      //            new double[] { 0.5949,    0.2622,    0.6028,    0.7112,    0.2217,    0.1174,    0.2967,    0.3188,   0.4242,    0.5079 },
-      //            new double[] { 0.0855,    0.2625,    0.8010,    0.0292,    0.9289,    0.7303,    0.4886,    0.5785,   0.2373,    0.4588 }
-      //          }
-      //);
+      prod.Factors.Clear();
+      prod.Factors.Add(new MeanConst());
+      prod.Factors.Add(new MeanLinear());
+      TestMeanFunction(prod, 1,
+  new double[] { 1.843574580675791, 2.127929337522181, 3.116568910281474, 1.688566127130978, 3.250517738447450, 2.961262743634280, 2.326019412613392, 1.729286976436201, 1.769654419215176, 2.398170347588917 },
+  new double[][]
+                {
+                  new double[] { 2.9088,    1.8646,    3.1971,    1.9890,    1.7640,    1.2801,    2.8059,    3.7243,    3.1899    ,1.4978 },
+                  new double[] { 0.4173,    0.0497,    0.9027,    0.9448,    0.4909,    0.4893,    0.3377,    0.9001,    0.3692    ,0.1112 },
+                  new double[] { 0.7803,    0.3897,    0.2417,    0.4039,    0.0965,    0.1320,    0.9421,    0.9561,    0.5752    ,0.0598 },
+                  new double[] { 0.2348,    0.3532,    0.8212,    0.0154,    0.0430,    0.1690,    0.6491,    0.7317,    0.6477    ,0.4509 },
+                  new double[] { 0.5470,    0.2963,    0.7447,    0.1890,    0.6868,    0.1835,    0.3685,    0.6256,    0.7802    ,0.0811 },
+                  new double[] { 0.9294,    0.7757,    0.4868,    0.4359,    0.4468,    0.3063,    0.5085,    0.5108,    0.8176    ,0.7948 }
+                }
+);
     }
 

trunk/sources/HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/GaussianProcessRegressionTest.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using HeuristicLab.Algorithms.DataAnalysis;
 using HeuristicLab.Common;
-using HeuristicLab.Core;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.SequentialEngine;
+using HeuristicLab.Problems.Instances.DataAnalysis;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace HeuristicLab_33.Tests {
+namespace HeuristicLab.Algorithms.DataAnalysis_34.Tests {
   [TestClass]
+  [DeploymentItem(@"HeuristicLab.Algorithms.DataAnalysis-3.4/co2.txt")]
   public class GaussianProcessRegressionTest {
     public GaussianProcessRegressionTest() { }
@@ -58 +57 @@
       ex = null;
 
-      var cv = new CrossValidation();
       var alg = new GaussianProcessRegression();
-      alg.Engine = new SequentialEngine();
-      cv.Algorithm = alg;
+      alg.Engine = new HeuristicLab.SequentialEngine.SequentialEngine();
 
-      cv.Problem = new RegressionProblem();
-      var rand = new HeuristicLab.Random.MersenneTwister();
-      double[,] data = GenerateData(100, rand);
-      List<string> variables = new List<string>() { "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "y" };
-      Dataset ds = new Dataset(variables, data);
-      cv.Problem.ProblemDataParameter.ActualValue = new RegressionProblemData(ds, variables.Take(10), variables.Last());
-      cv.Algorithm.Prepare();
-      cv.Folds.Value = 5;
-      cv.SamplesStart.Value = 0;
-      cv.SamplesEnd.Value = 99;
+      alg.Problem = new RegressionProblem();
+      var provider = new RegressionCSVInstanceProvider();
+      var problemData = (RegressionProblemData)provider.ImportData("co2.txt");
+      problemData.TargetVariableParameter.ActualValue = problemData.TargetVariableParameter.ValidValues.First(x => x.Value == "interpolated");
+      problemData.InputVariables.SetItemCheckedState(problemData.InputVariables.First(x => x.Value == "year"), false);
+      problemData.InputVariables.SetItemCheckedState(problemData.InputVariables.First(x => x.Value == "month"), false);
+      problemData.InputVariables.SetItemCheckedState(problemData.InputVariables.First(x => x.Value == "average"), false);
+      problemData.InputVariables.SetItemCheckedState(problemData.InputVariables.First(x => x.Value == "interpolated"), false);
+      problemData.InputVariables.SetItemCheckedState(problemData.InputVariables.First(x => x.Value == "trend"), false);
+      problemData.InputVariables.SetItemCheckedState(problemData.InputVariables.First(x => x.Value == "#days"), false);
 
-      cv.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(cv_ExceptionOccurred);
-      cv.Stopped += new EventHandler(cv_Stopped);
+      alg.Problem.ProblemDataParameter.Value = problemData;
 
-      cv.Prepare();
-      cv.Start();
+      alg.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(cv_ExceptionOccurred);
+      alg.Stopped += new EventHandler(cv_Stopped);
+
+      alg.Prepare();
+      alg.Start();
       trigger.WaitOne();
       if (ex != null) throw ex;
 
-      TestContext.WriteLine("Runtime: {0}", cv.ExecutionTime.ToString());
-
-    }
-
-    // poly-10: y = x1 x2 + x3 x4 + x5 x6 + x1 x7 x9 + x3 x6 x10
-    private double[,] GenerateData(int n, IRandom random) {
-      double[,] data = new double[n, 11];
-      for (int i = 0; i < n; i++) {
-        for (int c = 0; c < 10; c++) {
-          data[i, c] = random.NextDouble() * 2.0 - 1.0;
-        }
-        data[i, 10] =
-          data[i, 0] * data[i, 1] +
-          data[i, 2] * data[i, 3] +
-          data[i, 4] * data[i, 5] +
-          data[i, 0] * data[i, 6] * data[i, 8] +
-          data[i, 2] * data[i, 5] * data[i, 9];
-      }
-      return data;
+      TestContext.WriteLine("Runtime: {0}", alg.ExecutionTime.ToString());
     }
 

trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -279 +279 @@
     <Compile Include="HeuristicLab-3.3\ContentViewTests.cs" />
     <Compile Include="HeuristicLab-3.3\ParameterVisibilityTest.cs" />
-    <Compile Include="HeuristicLab-3.3\GaussianProcessRegressionTest.cs" />
     <Compile Include="HeuristicLab-3.3\DeepCloneableCloningTest.cs" />
     <Compile Include="HeuristicLab-3.3\GeneticAlgorithmTest.cs" />
@@ -290 +289 @@
     <Compile Include="HeuristicLab-3.3\ThreadSafeLogTest.cs" />
     <Compile Include="HeuristicLab-3.3\ToStringTest.cs" />
+    <Compile Include="HeuristicLab.Algorithms.DataAnalysis-3.4\GaussianProcessModelTest.cs" />
     <Compile Include="HeuristicLab.Algorithms.DataAnalysis-3.4\GaussianProcessFunctionsTest.cs" />
+    <Compile Include="HeuristicLab.Algorithms.DataAnalysis-3.4\GaussianProcessRegressionTest.cs" />
     <Compile Include="HeuristicLab.Analysis-3.3\MultidimensionalScalingTest.cs" />
     <Compile Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3\Auxiliary.cs" />
@@ -388 +389 @@
   </ItemGroup>
   <ItemGroup>
+    <Content Include="HeuristicLab.Algorithms.DataAnalysis-3.4\co2.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="app.config" />
     <None Include="Builder.testsettings">