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

Timestamp:

11/20/12 14:04:29 (11 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/Util.cs (modified) (4 diffs)

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

@@ -48 +48 @@
       double ss = 0.0;
       if (columnIndices == null) columnIndices = Enumerable.Range(0, x.GetLength(1));
-      foreach (int k in columnIndices) {
-        double d = x[i, k] - xt[j, k];
+      foreach (int columnIndex in columnIndices) {
+        double d = x[i, columnIndex] - xt[j, columnIndex];
         ss += d * d;
       }
@@ -63 +63 @@
       if (columnIndices == null) columnIndices = Enumerable.Range(0, x.GetLength(1));
       int scaleIndex = 0;
-      foreach (int k in columnIndices) {
-        double d = x[i, k] - xt[j, k];
+      foreach (int columnIndex in columnIndices) {
+        double d = x[i, columnIndex] - xt[j, columnIndex];
         ss += d * d * scale[scaleIndex] * scale[scaleIndex];
         scaleIndex++;
       }
+      // must be at the end of scale after iterating over columnIndices
+      if (scaleIndex != scale.Length)
+        throw new ArgumentException("Lengths of scales and covariance functions does not match.");
       return ss;
     }
@@ -77 +80 @@
       double sum = 0.0;
       if (columnIndices == null) columnIndices = Enumerable.Range(0, x.GetLength(1));
-      foreach (int k in columnIndices) {
-        sum += x[i, k] * xt[j, k];
+      foreach (int columnIndex in columnIndices) {
+        sum += x[i, columnIndex] * xt[j, columnIndex];
       }
       return scale * scale * sum;
@@ -90 +93 @@
       if (columnIndices == null) columnIndices = Enumerable.Range(0, x.GetLength(1));
       int scaleIndex = 0;
-      foreach (int k in columnIndices) {
-        sum += x[i, k] * scale[scaleIndex] * xt[j, k] * scale[scaleIndex];
+      foreach (int columnIndex in columnIndices) {
+        sum += x[i, columnIndex] * scale[scaleIndex] * xt[j, columnIndex] * scale[scaleIndex];
         scaleIndex++;
       }
+      // must be at the end of scale after iterating over columnIndices
+      if (scaleIndex != scale.Length)
+        throw new ArgumentException("Lengths of scales and covariance functions does not match.");
+
       return sum;
     }