Changeset 8933 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceMask.cs

Timestamp:

11/20/12 14:04:29 (12 years ago)

Author:

gkronber

Message:

#1902 corrected handling of length-parameter arrays in ARD functions and prevented stacking of mask covariance functions to make sure that the length-parameter and the enumerable of selected column indexes are equally long.

File:

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

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceMask.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -111 +112 @@
 
     public double GetCovariance(double[,] x, int i, int j, IEnumerable<int> columnIndices) {
+      // cov mask overwrites the previously selected columnIndices 
+      // -> stacking of CovarianceMask is not supported
+      if (columnIndices != null && columnIndices.Count() != x.GetLength(1))
+        throw new InvalidOperationException("Stacking of masking covariance functions is not supported.");
+
       return cov.GetCovariance(x, i, j, selectedDimensions);
     }
 
     public IEnumerable<double> GetGradient(double[,] x, int i, int j, IEnumerable<int> columnIndices) {
+      if (columnIndices != null && columnIndices.Count() != x.GetLength(1))
+        throw new InvalidOperationException("Stacking of masking covariance functions is not supported.");
+
       return cov.GetGradient(x, i, j, selectedDimensions);
     }
 
     public double GetCrossCovariance(double[,] x, double[,] xt, int i, int j, IEnumerable<int> columnIndices) {
+      if (columnIndices != null && columnIndices.Count() != x.GetLength(1))
+        throw new InvalidOperationException("Stacking of masking covariance functions is not supported.");
+
       return cov.GetCrossCovariance(x, xt, i, j, selectedDimensions);
     }