Changeset 7460 for branches/HeuristicLab.TimeSeries/HeuristicLab.Analysis/3.3/MultidimensionalScaling

Timestamp:

02/06/12 17:50:17 (13 years ago)

Author:

gkronber

Message:

#1081: merged r7266:7459 from the trunk into the time series prognosis branch.

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (2 props)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis/3.3/MultidimensionalScaling/MultidimensionalScaling.cs (modified) (3 diffs)

branches/HeuristicLab.TimeSeries

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

branches/HeuristicLab.TimeSeries/HeuristicLab.Analysis/3.3/MultidimensionalScaling/MultidimensionalScaling.cs

@@ -103 +103 @@
     private static void StressFitness(double[] x, double[] fi, object obj) {
       Info info = (obj as Info);
+      int idx = 0;
       for (int i = 0; i < info.Coordinates.Rows; i++) {
-        double f = Stress(x, info.Dissimilarities[info.Row, i], info.Coordinates[i, 0], info.Coordinates[i, 1]);
-        if (i < info.Row) fi[i] = f;
-        else if (i > info.Row) fi[i - 1] = f;
+        if (i == info.Row) continue;
+        if (!double.IsNaN(info.Dissimilarities[info.Row, i]))
+          fi[idx++] = Stress(x, info.Dissimilarities[info.Row, i], info.Coordinates[i, 0], info.Coordinates[i, 1]);
+        else fi[idx++] = 0.0;
       }
     }
@@ -114 +116 @@
       int idx = 0;
       for (int i = 0; i < info.Coordinates.Rows; i++) {
-        if (i != info.Row) {
-          double c = info.Dissimilarities[info.Row, i];
-          double a = info.Coordinates[i, 0];
-          double b = info.Coordinates[i, 1];
-          double f = Stress(x, c, a, b);
-          fi[idx] = f;
+        if (i == info.Row) continue;
+        double c = info.Dissimilarities[info.Row, i];
+        double a = info.Coordinates[i, 0];
+        double b = info.Coordinates[i, 1];
+        if (!double.IsNaN(c)) {
+          fi[idx] = Stress(x, c, a, b); ;
           jac[idx, 0] = 2 * (x[0] - a) * (Math.Sqrt((a - x[0]) * (a - x[0]) + (b - x[1]) * (b - x[1])) - c) / Math.Sqrt((a - x[0]) * (a - x[0]) + (b - x[1]) * (b - x[1]));
           jac[idx, 1] = 2 * (x[1] - b) * (Math.Sqrt((a - x[0]) * (a - x[0]) + (b - x[1]) * (b - x[1])) - c) / Math.Sqrt((a - x[0]) * (a - x[0]) + (b - x[1]) * (b - x[1]));
-          idx++;
+        } else {
+          fi[idx] = jac[idx, 0] = jac[idx, 1] = 0;
         }
+        idx++;
       }
     }
@@ -153 +157 @@
       for (int i = 0; i < dimension - 1; i++) {
         for (int j = i + 1; j < dimension; j++) {
-          if (dissimilarities[i, j] != dissimilarities[j, i]) throw new ArgumentException("Dissimilarities is not a symmetric matrix.", "dissimilarities");
-          if (dissimilarities[i, j] != 0) {
+          if (dissimilarities[i, j] != dissimilarities[j, i] && !(double.IsNaN(dissimilarities[i, j]) && double.IsNaN(dissimilarities[j, i])))
+            throw new ArgumentException("Dissimilarities is not a symmetric matrix.", "dissimilarities");
+          if (!double.IsNaN(dissimilarities[i, j])) {
             stress += Stress(coordinates[i, 0], coordinates[i, 1], dissimilarities[i, j], coordinates[j, 0], coordinates[j, 1]);
             normalization += (dissimilarities[i, j] * dissimilarities[i, j]);

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user