Changeset 10139 for branches

Timestamp:

11/17/13 11:50:56 (11 years ago)

Author:

ascheibe

Message:

#1886 fixed a bug in the PermutationConvexHullModifier

Location:

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

Files:

• DistanceMatrixToPoints.cs (modified) (1 diff)
• RunCollectionModifiers/PermutationConvexHullModifier.cs (modified) (1 diff)

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

@@ -82 +82 @@
       double[,] v; //eigenvectors
 
+      if (n < k)
+        throw new ArgumentException("Distance matrix length must be greater than dimension", "k");
 
       double[][] x = SquareMatrix(dm);

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/RunCollectionModifiers/PermutationConvexHullModifier.cs

@@ -66 +66 @@
         while (sols.Count != 0) {
           double[][] dm = CalculateDistanceMatrixFromPermutations(sols);
+
+          if (dim > dm.Length)
+            dim = dm.Length - 1;
+
           double[][] popPoints = DistanceMatrixToPoints.MetricMDS(dm, dim);