Changeset 10078 for branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests

Timestamp:

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

Author:

ascheibe

Message:

#1886 another bugfix in the point calculation from distance matrices

File:

• branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests/DistanceMatrixToPointsTest.cs (modified) (3 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);
     }