Changeset 15165 for trunk

Timestamp:

07/06/17 17:58:04 (7 years ago)

Author:

gkronber

Message:

#2782: fixed calculation of log pseudo-likelihood by adding the noise term to the covariance function

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModel.cs (modified) (1 diff)

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

@@ -230 +230 @@
       for (int i = 0; i < n; i++) {
         for (int j = 0; j < n; j++) ki[j] = cov.Covariance(x, i, j);
+        ki[i] += sqrSigmaNoise;
+
         var yi = Util.ScalarProd(ki, alpha);
         var yi_loo = yi - alpha[i] / (lCopy[i, i] / sqrSigmaNoise);
-        var s2_loo = sqrSigmaNoise / lCopy[i, i];
+        var s2_loo = 1.0 / (lCopy[i, i] / sqrSigmaNoise);
         var err = ym[i] - yi_loo;
-        var nll_loo = Math.Log(s2_loo) + err * err / s2_loo;
+        var nll_loo = 0.5 * Math.Log(2 * Math.PI * s2_loo) + 0.5 * err * err / s2_loo;
         sumLoo += nll_loo;
       }
-      sumLoo += n * Math.Log(2 * Math.PI);
-      loocvNegLogPseudoLikelihood = 0.5 * sumLoo;
+      loocvNegLogPseudoLikelihood = sumLoo;
 
       for (int i = 0; i < n; i++) {