Changeset 10530 for stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceConst.cs

Timestamp:

03/04/14 11:30:58 (11 years ago)

Author:

gkronber

Message:

#2125: merged r10489:10491 and r10493 from trunk into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceConst.cs (modified) (5 diffs)

stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceConst.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -36 +37 @@
       get { return (IValueParameter<DoubleValue>)Parameters["Scale"]; }
     }
-
+    private bool HasFixedScaleParameter {
+      get { return ScaleParameter.Value != null; }
+    }
     [StorableConstructor]
     private CovarianceConst(bool deserializing)
@@ -59 +62 @@
 
     public int GetNumberOfParameters(int numberOfVariables) {
-      return ScaleParameter.Value != null ? 0 : 1;
+      return HasFixedScaleParameter ? 0 : 1;
     }
 
@@ -71 +74 @@
       int c = 0;
       // gather parameter values
-      if (ScaleParameter.Value != null) {
+      if (HasFixedScaleParameter) {
         scale = ScaleParameter.Value.Value;
       } else {
@@ -87 +90 @@
       cov.Covariance = (x, i, j) => scale;
       cov.CrossCovariance = (x, xt, i, j) => scale;
-      cov.CovarianceGradient = (x, i, j) => GetGradient(x, i, j, scale, columnIndices);
+      if (HasFixedScaleParameter) {
+        cov.CovarianceGradient = (x, i, j) => Enumerable.Empty<double>();
+      } else {
+        cov.CovarianceGradient = (x, i, j) => GetGradient(x, i, j, scale, columnIndices);
+      }
       return cov;
     }