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

Timestamp:

04/15/13 10:43:42 (11 years ago)

Author:

gkronber

Message:

#1902 minor code improvements: removed commented code, always supply non-null columnIndizes.

File:

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

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

@@ -74 +74 @@
 
     public ParameterizedCovarianceFunction GetParameterizedCovarianceFunction(double[] p, IEnumerable<int> columnIndices) {
-      if (columnIndices != null)
-        throw new InvalidOperationException("Stacking of masking covariance functions is not supported.");
       var cov = CovarianceFunctionParameter.Value;
       var selectedDimensions = SelectedDimensionsParameter.Value;
 
-      return cov.GetParameterizedCovarianceFunction(p, selectedDimensions);
+      return cov.GetParameterizedCovarianceFunction(p, selectedDimensions.Intersect(columnIndices));
     }
   }