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

Timestamp:

10/22/12 14:37:46 (12 years ago)

Author:

gkronber

Message:

#1902: fixed bugs concerning masking covariance function

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/Util.cs (modified) (3 diffs)

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

@@ -56 +56 @@
 
     public static double SqrDist(double[,] x, int i, int j, double[] scale, IEnumerable<int> columnIndices = null) {
-      return SqrDist(x, i, x, j, scale);
+      return SqrDist(x, i, x, j, scale, columnIndices);
     }
 
@@ -62 +62 @@
       double ss = 0.0;
       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];
-        ss += d * d * scale[k] * scale[k];
+        ss += d * d * scale[scaleIndex] * scale[scaleIndex];
+        scaleIndex++;
       }
       return ss;
@@ -87 +89 @@
       double sum = 0.0;
       if (columnIndices == null) columnIndices = Enumerable.Range(0, x.GetLength(1));
+      int scaleIndex = 0;
       foreach (int k in columnIndices) {
-        sum += x[i, k] * scale[k] * xt[j, k] * scale[k];
+        sum += x[i, k] * scale[scaleIndex] * xt[j, k] * scale[scaleIndex];
+        scaleIndex++;
       }
       return sum;