Changeset 13620 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Comparators/GenerationalDistance.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/GenerationalDistance.cs (modified) (2 diffs)

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

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
 using HeuristicLab.Encodings.RealVectorEncoding;
+using HeuristicLab.Problems.MultiObjectiveTestFunctions.Comparators;
 
 namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
@@ -15 +17 @@
     }
 
-
-    public static double GetDistance(RealVector[] front, RealVector[] optimalFront, double p) {
+    public static double GetDistance(IEnumerable<double[]> front, IEnumerable<double[]> optimalFront, double p) {
      return new GenerationalDistance(p).Compare(front,optimalFront);
     }
 
-    public double Compare(RealVector[] front, RealVector[] optimalFront) {
-     //TODO build a kd-tree, sort the array, do someting intelligent here
-     double sum = 0;
-      if (front.Length == 0 || optimalFront.Length == 0) throw new Exception("Both Fronts need to contain at least one point");
-     foreach(RealVector r in front) {
-        sum += minDistance(r, optimalFront);
+    public double Compare(IEnumerable<double[]> front, IEnumerable<double[]> optimalFront) {
+      //TODO build a kd-tree, sort the array, do someting intelligent here
+      if (front == null || optimalFront == null) throw new ArgumentException("Fronts must not be null");
+      double sum = 0;
+      int c = 0;
+     foreach(double[] r in front) {
+        sum += Utilities.minDistance(r, optimalFront,true);
+        c++;
       }
-      return Math.Pow(sum, p) /front.Length;
+      if (c == 0) throw new ArgumentException("Fronts must not be empty");
+      return Math.Pow(sum, p) /c;
     }
 
-    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);
-    }
+    
 
   }