Changeset 9099 for branches

Timestamp:

01/03/13 15:30:41 (12 years ago)

Author:

gkronber

Message:

#1967: adapted GP tuning branch to work with most recent trunk

Location:

branches/HeuristicLab.Problems.GaussianProcessTuning

Files:

• HeuristicLab.Problems.GaussianProcessTuning.Tests/UnitTest.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessPolyTen.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso1.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso2.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso3.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso4.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso5.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso6.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIsoDependentNoise.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/Instances.DataAnalysis.GaussianProcessRegression-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/Util.cs (modified) (2 diffs)
• PreBuildEvent.cmd (added)

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning.Tests/UnitTest.cs

@@ -2 +2 @@
 using System.Linq;
 using System.Threading;
+using HeuristicLab.Algorithms.DataAnalysis;
 using HeuristicLab.Algorithms.GeneticAlgorithm;
 using HeuristicLab.Problems.DataAnalysis;

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessPolyTen.cs

@@ -129 +129 @@
       covarianceFunction.Terms.Add(t5);
 
-      covarianceFunction.SetParameter(hyp.ToArray());
+      var cov = covarianceFunction.GetParameterizedCovarianceFunction(hyp, Enumerable.Range(0, AllowedInputVariables.Count()));
 
-      var target = Util.SampleGaussianProcess(mt, covarianceFunction, data);
+
+      var target = Util.SampleGaussianProcess(mt, cov, data);
       data.Add(target);
 

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso.cs

@@ -56 +56 @@
       covarianceFunction.Terms.Add(new CovarianceSquaredExponentialIso());
       covarianceFunction.Terms.Add(new CovarianceNoise());
-      covarianceFunction.SetParameter(new double[] { Math.Log(0.1), Math.Log(Math.Sqrt(1)), Math.Log(Math.Sqrt(0.01)) });
+      var cov =
+        covarianceFunction.GetParameterizedCovarianceFunction(
+          new double[] { Math.Log(0.1), Math.Log(Math.Sqrt(1)), Math.Log(Math.Sqrt(0.01)) },
+          Enumerable.Range(0, AllowedInputVariables.Count()));
 
       var mt = new MersenneTwister(31415);
-      var target = Util.SampleGaussianProcess(mt, covarianceFunction, data);
+      var target = Util.SampleGaussianProcess(mt, cov, data);
       data.Add(target);
 

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso1.cs

@@ -65 +65 @@
       covFun.Terms.Add(m1);
       covFun.Terms.Add(new CovarianceNoise());
-      covFun.SetParameter(hyp.ToArray());
 
+      var cov = covFun.GetParameterizedCovarianceFunction(hyp, Enumerable.Range(0, AllowedInputVariables.Count()));
       var mt = new MersenneTwister();
-      var target = Util.SampleGaussianProcess(mt, covFun, data);
+      var target = Util.SampleGaussianProcess(mt, cov, data);
       data.Add(target);
 

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso2.cs

@@ -70 +70 @@
       covFun.Terms.Add(m2);
       covFun.Terms.Add(new CovarianceNoise());
-      covFun.SetParameter(hyp.ToArray());
+      var cov = covFun.GetParameterizedCovarianceFunction(hyp, Enumerable.Range(0, AllowedInputVariables.Count()));
 
       var mt = new MersenneTwister();
-      var target = Util.SampleGaussianProcess(mt, covFun, data);
+      var target = Util.SampleGaussianProcess(mt, cov, data);
       data.Add(target);
 

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso3.cs

@@ -75 +75 @@
       covFun.Terms.Add(m3);
       covFun.Terms.Add(new CovarianceNoise());
-      covFun.SetParameter(hyp.ToArray());
+      var cov = covFun.GetParameterizedCovarianceFunction(hyp, Enumerable.Range(0, AllowedInputVariables.Count()));
 
       var mt = new MersenneTwister();
-      var target = Util.SampleGaussianProcess(mt, covFun, data);
+      var target = Util.SampleGaussianProcess(mt, cov, data);
       data.Add(target);
 

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso4.cs

@@ -65 +65 @@
       covFun.Terms.Add(m1);
       covFun.Terms.Add(new CovarianceNoise());
-      covFun.SetParameter(hyp.ToArray());
 
+      var cov = covFun.GetParameterizedCovarianceFunction(hyp, Enumerable.Range(0, AllowedInputVariables.Count()));
       var mt = new MersenneTwister();
-      var target = Util.SampleGaussianProcess(mt, covFun, data);
+      var target = Util.SampleGaussianProcess(mt, cov, data);
       data.Add(target);
 

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso5.cs

@@ -69 +69 @@
       covFun.Terms.Add(m2);
       covFun.Terms.Add(new CovarianceNoise());
-      covFun.SetParameter(hyp.ToArray());
+      var cov = covFun.GetParameterizedCovarianceFunction(hyp, Enumerable.Range(0, AllowedInputVariables.Count()));
 
       var mt = new MersenneTwister();
-      var target = Util.SampleGaussianProcess(mt, covFun, data);
+      var target = Util.SampleGaussianProcess(mt, cov, data);
       data.Add(target);
 

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIso6.cs

@@ -80 +80 @@
       covFun.Terms.Add(m4);
       covFun.Terms.Add(new CovarianceNoise());
-      covFun.SetParameter(hyp.ToArray());
+      var cov = covFun.GetParameterizedCovarianceFunction(hyp, Enumerable.Range(0, AllowedInputVariables.Count()));
+
 
       var mt = new MersenneTwister();
-      var target = Util.SampleGaussianProcess(mt, covFun, data);
+      var target = Util.SampleGaussianProcess(mt, cov, data);
       data.Add(target);
 

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/GaussianProcessSEIsoDependentNoise.cs

@@ -67 +67 @@
           Math.Log(Math.Sqrt(0.01)) // noise
         };
-      covarianceFunction.SetParameter(hyp);
+      var cov = covarianceFunction.GetParameterizedCovarianceFunction(hyp, Enumerable.Range(0, AllowedInputVariables.Count()));
 
       var mt = new MersenneTwister(31415);
-      var target = Util.SampleGaussianProcess(mt, covarianceFunction, data);
+      var target = Util.SampleGaussianProcess(mt, cov, data);
       data.Add(target);
 

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/Instances.DataAnalysis.GaussianProcessRegression-3.3.csproj

@@ -213 +213 @@
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent />
+    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set Outdir=$(Outdir)
+
+call PreBuildEvent.cmd
+</PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.Instances.DataAnalysis.GaussianProcessRegression/Util.cs

@@ -32 +32 @@
 
 
-    public static List<double> SampleGaussianProcess(IRandom random, ICovarianceFunction covFunction, List<List<double>> data) {
+    public static List<double> SampleGaussianProcess(IRandom random, ParameterizedCovarianceFunction covFunction, List<List<double>> data) {
 
       double[,] x = new double[data[0].Count, data.Count];
@@ -41 +41 @@
       for (int i = 0; i < K.GetLength(0); i++)
         for (int j = i; j < K.GetLength(1); j++)
-          K[i, j] = covFunction.GetCovariance(x, i, j, null);
+          K[i, j] = covFunction.Covariance(x, i, j);
 
       var normalRand = new NormalDistributedRandom(random, 0, 1);