Changeset 10078

Timestamp:

10/22/13 00:05:02 (11 years ago)

Author:

ascheibe

Message:

#1886 another bugfix in the point calculation from distance matrices

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

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

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

@@ -29 +29 @@
     [TestMethod]
     public void TestDistanceMatrixConversion() {
-      int nrOfPoints = 5;
+      int nrOfPoints = 4;
       int dim = 2;
       double[][] orgPoints = new double[nrOfPoints][];
@@ -44 +44 @@
 
       newPoints = DistanceMatrixToPoints.ConvertDistanceMatrixToPoints(orgDm);
+
       CalculateDistanceMatrix(newDm, newPoints);
       //TODO
@@ -68 +69 @@
 
     private static double CalcEuclideanDistance(double[] p1, double[] p2) {
-      return Math.Sqrt(Math.Pow(p1[0] - p2[0], 2) + Math.Pow(p1[1] - p2[1], 2));
+      double result = 0.0;
+      for (int i = 0; i < p1.Length; i++) {
+        result += Math.Pow(p1[i] - p2[i], 2);
+      }
+      return Math.Sqrt(result);
     }
 

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

@@ -54 +54 @@
       if (!res) throw new Exception("Eigenvalue computation did not converge!");
 
-      int zeroCnt = q.Count(x => x.IsAlmost(0));
+      int zeroCnt = q.Count(x => x.IsAlmost(0) || x < 0.0);
       for (int i = 0; i < dm.Length; i++) {
         points[i] = new double[dm.Length - zeroCnt];
@@ -61 +61 @@
       int pi = 0;
       for (int i = 0; i < dm.Length; i++) {
-        if (q[i].IsAlmost(0)) {
+        if (!q[i].IsAlmost(0) && q[i] > 0.0) {
           for (int j = 0; j < dm.Length; j++) {
             points[j][pi] = Math.Sqrt(q[i]) * v[j, i];