Changeset 16171 for branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Utilities.cs

Timestamp:

09/21/18 09:18:49 (6 years ago)

Author:

bwerth

Message:

#2943 worked on MOBasicProblem - added Interfaces;reworked MOCalculators; several minor changes

File:

• branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Utilities.cs (modified) (2 diffs)

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Utilities.cs

@@ -26 +26 @@
 namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
   internal static class Utilities {
-    internal static double MinimumDistance(double[] point, IEnumerable<double[]> points) {
-      if (point == null) throw new ArgumentNullException("Point must not be null.");
-      if (points == null) throw new ArgumentNullException("Points must not be null.");
-      if (!points.Any()) throw new ArgumentException("Points must not be empty.");
-
-      double minDistance = double.MaxValue;
-      foreach (double[] r in points) {
-        if (r.Length != point.Length) throw new ArgumentException("Dimensions of Points and Point do not match.");
-
-        double squaredDistance = 0;
-        for (int i = 0; i < r.Length; i++) {
-          squaredDistance += (point[i] - r[i]) * (point[i] - r[i]);
-        }
-        minDistance = Math.Min(squaredDistance, minDistance);
-      }
-
-      return Math.Sqrt(minDistance);
-    }
-
     internal static DoubleMatrix ToMatrix(IEnumerable<double[]> source) {
       try {
-        int firstDimension = source.Count();
-        int secondDimension = source.GroupBy(row => row.Length).Single().Key; // throws InvalidOperationException if source is not rectangular
+        var firstDimension = source.Count();
+        var secondDimension = source.GroupBy(row => row.Length).Single().Key; // throws InvalidOperationException if source is not rectangular
 
         var result = new DoubleMatrix(firstDimension, secondDimension);
         var enumarator = source.GetEnumerator();
-        for (int i = 0; i < firstDimension && enumarator.MoveNext(); ++i)
-          for (int j = 0; j < secondDimension; ++j)
+        for (var i = 0; i < firstDimension && enumarator.MoveNext(); ++i)
+          for (var j = 0; j < secondDimension; ++j)
             result[i, j] = enumarator.Current[j];
         return result;
@@ -62 +43 @@
     }
 
-    internal class DimensionComparer : IComparer<double[]> {
-      private readonly int dim;
-      private readonly int descending;
-
-      public DimensionComparer(int dimension, bool descending) {
-        this.dim = dimension;
-        this.descending = descending ? -1 : 1;
-      }
-
-      public int Compare(double[] x, double[] y) {
-        if (x[dim] < y[dim]) return -descending;
-        else if (x[dim] > y[dim]) return descending;
-        else return 0;
-      }
-    }
+    
   }
 }