Changeset 8484 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceNoise.cs

Timestamp:

08/14/12 13:25:17 (12 years ago)

Author:

gkronber

Message:

#1902 changed interface for covariance functions to improve readability, fixed several bugs in the covariance functions and in the line chart for Gaussian process models.

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceNoise.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceNoise.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -59 +60 @@
       this.sf2 = Math.Exp(2 * hyp[0]);
     }
-    public void SetData(double[,] x) {
-      // nothing to do
+
+    public double GetCovariance(double[,] x, int i, int j) {
+      return sf2;
     }
 
-
-    public void SetData(double[,] x, double[,] xt) {
-      // nothing to do
+    public IEnumerable<double> GetGradient(double[,] x, int i, int j) {
+      yield return 2 * sf2;
     }
 
-    public double GetCovariance(int i, int j) {
-      if (i == j) return sf2;
-      else return 0.0;
-    }
-
-    public double GetGradient(int i, int j, int k) {
-      if (k != 0) throw new ArgumentException("CovarianceConst has only one hyperparameters", "k");
-      if (i == j)
-        return 2 * sf2;
-      else
-        return 0.0;
+    public double GetCrossCovariance(double[,] x, double[,] xt, int i, int j) {
+      return 0.0;
     }
   }