Changeset 13672 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Calculators/InvertedGenerationalDistance.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)
• InvertedGenerationalDistance.cs (modified) (1 diff)

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Calculators/InvertedGenerationalDistance.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.Collections.Generic;
-using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Problems.MultiObjectiveTestFunctions.Comparators;
 
 namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
+
   /// <summary>
   /// The inverted generational Distance is defined as the mean of a all d[i]^(1/p),
   ///  where d[i] is the minimal distance the ith point of the optimal pareto front has to any point in the evaluated front.   
   /// </summary>
-  public class InvertedGenerationalDistance : IMultiObjectiveDistance {
-    private double p;
+  public class InvertedGenerationalDistance {
 
-    public InvertedGenerationalDistance(double p) {
-      if (p <= 0) throw new ArgumentOutOfRangeException("weighting factor p has to be greater than 0");
-      this.p = 1 / p;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="front"></param>
-    /// <param name="optimalFront"></param>
-    /// <param name="p"></param>
-    /// <returns></returns>
-    public static double GetDistance(IEnumerable<double[]> front, IEnumerable<double[]> optimalFront, double p) {
-      return new InvertedGenerationalDistance(p).Compare(front, optimalFront);
-    }
-
-    public double Compare(IEnumerable<double[]> front, IEnumerable<double[]> optimalFront) {
-      return new GenerationalDistance(p).Compare(optimalFront, front);
+    public static double Calculate(IEnumerable<double[]> front, IEnumerable<double[]> optimalFront, double p) {
+      return GenerationalDistance.Calculate(optimalFront, front, p);
     }
   }