Changeset 13672 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Calculators/GenerationalDistance.cs

Timestamp:

03/09/16 12:44:23 (8 years ago)

Author:

bwerth

Message:

#1087 added Analyzers, reworked PFStore, added licence information, cleaned code

Location:

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Calculators

Files:

• . (moved) (moved from branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Comparators)
• GenerationalDistance.cs (modified) (2 diffs)

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

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+using System;
 using System.Collections.Generic;
-using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Problems.MultiObjectiveTestFunctions.Comparators;
 
 namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
@@ -10 +28 @@
   ///  where d[i] is the minimal distance the ith point of the evaluated front has to any point in the optimal pareto front.   
   /// </summary>
-  public class GenerationalDistance : IMultiObjectiveDistance {
-    private double p; //dampening Factor
+  public class GenerationalDistance {
 
-    public GenerationalDistance(double p) {
-      this.p = 1 / p;
-    }
-
-    public static double GetDistance(IEnumerable<double[]> front, IEnumerable<double[]> optimalFront, double p) {
-     return new GenerationalDistance(p).Compare(front,optimalFront);
-    }
-
-    public double Compare(IEnumerable<double[]> front, IEnumerable<double[]> optimalFront) {
+    public static double Calculate(IEnumerable<double[]> front, IEnumerable<double[]> optimalFront, double p) {
       //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);
+      foreach (double[] r in front) {
+        sum += Utilities.minDistance(r, optimalFront, true);
         c++;
       }
       if (c == 0) throw new ArgumentException("Fronts must not be empty");
-      return Math.Pow(sum, p) /c;
+      return Math.Pow(sum, 1 / p) / c;
     }
 
-    
+
 
   }