Changeset 10127 for branches

Timestamp:

11/11/13 22:41:09 (11 years ago)

Author:

ascheibe

Message:

#1886 fixed a bug in metric mds and added another unit test

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

• AlgorithmBehaviorUnitTests/DistanceMatrixToPointsTest.cs (modified) (1 diff)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/DistanceMatrixToPoints.cs (modified) (2 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests/DistanceMatrixToPointsTest.cs

@@ -212 +212 @@
     }
 
+    [TestMethod]
+    public void TestMetricMDSForSmallDistances() {
+      int nrOfPoints = 4;
+      int dim = 2;
+      double[][] orgPoints = new double[nrOfPoints][];
+      double[][] orgDm = new double[nrOfPoints][];
+      double[][] newDm = new double[nrOfPoints][];
+      double[][] newPoints = null;
+
+      AllocArray(orgPoints, dim);
+      AllocArray(orgDm, nrOfPoints);
+      AllocArray(newDm, nrOfPoints);
+      SmallDiffStaticPoints(orgPoints);
+      CalculateDistanceMatrix(orgDm, orgPoints);
+
+      Console.WriteLine("orgDm:");
+      PrintDM(orgDm);
+
+      newPoints = DistanceMatrixToPoints.MetricMDS(orgDm, dim, true);
+
+      CalculateDistanceMatrix(newDm, newPoints);
+      Console.WriteLine("newDm:");
+      PrintDM(newDm);
+
+      for (int i = 0; i < orgDm.Length; i++) {
+        for (int j = 0; j < orgDm.Length; j++) {
+          double diff = orgDm[i][j] - newDm[i][j];
+          Assert.IsTrue(diff.IsAlmost(0.0));
+        }
+      }
+    }
+
+    private static void SmallDiffStaticPoints(double[][] points) {
+      points[0][0] = 1;
+      points[0][1] = 1;
+
+      points[1][0] = 1.03;
+      points[1][1] = 1.2;
+
+      points[2][0] = 1.05;
+      points[2][1] = 1.01;
+
+      points[3][0] = 1.5;
+      points[3][1] = 1.1;
+    }
+
     private static double[][] StaticPermutationDM() {
       double[][] dm = new double[15][];

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/DistanceMatrixToPoints.cs

@@ -154 +154 @@
       }
 
-      double k1 = SumIfLZero(ev);
+      int k1 = SumIfLZero(ev);
       if (k1 < k) {
         throw new Exception("Zero-eigenvalues detected. This leads to a degenerate point set. Use constants. ");
-        //TODO: handling of this case; implement adding of constants
       }
 
@@ -227 +226 @@
     }
 
-    private static double SumIfLZero(double[] a) {
-      return a.Where(x => x > 0.0 && !x.IsAlmost(0.0)).Sum();
+    private static int SumIfLZero(double[] a) {
+      return a.Count(x => x > 0.0 && !x.IsAlmost(0.0));
     }