Changeset 13620 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Comparators/Spacing.cs

Timestamp:

02/15/16 17:19:34 (8 years ago)

Author:

bwerth

Message:

#1087 regorganized testfunctions, added view for qualities

File:

• branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Comparators/Spacing.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Comparators/Spacing.cs

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Encodings.RealVectorEncoding;
+using HeuristicLab.Problems.MultiObjectiveTestFunctions.Comparators;
 
 namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
@@ -15 +18 @@
 
 
-    public static double GetSpacing(RealVector[] front) {
+    public static double GetSpacing(IEnumerable<double[]> front) {
       return new Spacing().Get(front);
     }
-    public static double GetDistance(RealVector[] front, RealVector[] optimalFront) {
+    public static double GetDistance(IEnumerable<double[]> front, IEnumerable<double[]> optimalFront) {
       return new Spacing().Get(front);
     }
 
-    public double Compare(RealVector[] front, RealVector[] optimalFront) {
+    public double Compare(IEnumerable<double[]> front, IEnumerable<double[]> optimalFront) {
       return GetSpacing(front) - GetSpacing(optimalFront);
     }
 
-    public double Get(RealVector[] front) {
+    public double Get(IEnumerable<double[]> front) {
       //TODO build a kd-tree, sort the array, do someting intelligent here
-      double sum = 0;
-      if (front.Length == 0) throw new Exception("Front does not contain any points");
-      double[] d = new double[front.Length];
-      int i = 0;
-      foreach (RealVector r in front) {
-        d[i] = minDistance(r, front);
-        sum += d[i++];
+      if (front == null) throw new ArgumentException("Fronts must not be null");
+      List<double> d = new List<double>();
+      foreach (double[] r in front) {
+        double dist = Utilities.minDistance(r, front, false);
+        d.Add(dist>=0?dist:0);
+      }
+      int n = d.Count;
+      if (n == 0) throw new ArgumentException("Fronts must not be empty");
+      return Math.Sqrt(d.Variance()*(n-1)/n);
 
-      }
-      double mean = sum / front.Length;
-      sum = 0;
-      foreach (double e in d) {
-        sum += (e - mean) * (e - mean);
-      }
-      sum /= front.Length;
-      return Math.Sqrt(sum);
-
-    }
-
-    private double minDistance(RealVector point, RealVector[] list) {
-      //TODO inefficient
-      double min = Double.MaxValue;
-      foreach (RealVector r in list) {
-        if (r == point) continue;
-        double d = 0;
-        for (int i = 0; i < r.Length; i++) {
-          d += (point[i] - r[i]) * (point[i] - r[i]);
-        }
-        min = Math.Min(d, min);
-      }
-      return Math.Sqrt(min);
     }