Changeset 8682 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

09/23/12 12:17:36 (12 years ago)

Author:

gkronber

Message:

#1902

• fixed bug in cloning constructor of CovarianceMask
• removed throwing Exceptions in CovariancePeriodic (the behaviour of the periodic covariance function now matches the GPML implementation again.

Location:

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

Files:

• CovarianceMask.cs (modified) (1 diff)
• CovariancePeriodic.cs (modified) (3 diffs)

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

@@ -57 +57 @@
       : base(original, cloner) {
       this.selectedDimensionsParameter = cloner.Clone(original.selectedDimensionsParameter);
-      this.selectedDimensions = (int[])original.selectedDimensions.Clone();
+      if (original.selectedDimensions != null) {
+        this.selectedDimensions = (int[])original.selectedDimensions.Clone();
+      }
 
       this.covParameter = cloner.Clone(original.covParameter);

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

@@ -126 +126 @@
 
     public double GetCovariance(double[,] x, int i, int j, IEnumerable<int> columnIndices) {
-      if (columnIndices == null || columnIndices.Count() != 1)
-        throw new ArgumentException("The periodic covariance function can only be used for one dimension.", "columnIndices");
       double k = i == j ? 0.0 : GetDistance(x, x, i, j, columnIndices);
       k = Math.PI * k / period;
@@ -137 +135 @@
 
     public IEnumerable<double> GetGradient(double[,] x, int i, int j, IEnumerable<int> columnIndices) {
-      if (columnIndices == null || columnIndices.Count() != 1)
-        throw new ArgumentException("The periodic covariance function can only be used for one dimension.", "columnIndices");
       double v = i == j ? 0.0 : Math.PI * GetDistance(x, x, i, j, columnIndices) / period;
       double gradient = Math.Sin(v) * inverseLength;
@@ -149 +145 @@
 
     public double GetCrossCovariance(double[,] x, double[,] xt, int i, int j, IEnumerable<int> columnIndices) {
-      if (columnIndices == null || columnIndices.Count() != 1)
-        throw new ArgumentException("The periodic covariance function can only be used for one dimension.", "columnIndices");
       double k = GetDistance(x, xt, i, j, columnIndices);
       k = Math.PI * k / period;