Changeset 17225 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/Kursawe.cs

Timestamp:

08/29/19 13:53:26 (5 years ago)

Author:

mkommend

Message:

#2521: Integrated changes of #2943 into problem refactoring branch.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/Kursawe.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/Kursawe.cs

@@ -21 +21 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;
+using HeuristicLab.Optimization;
 using HEAL.Attic;
 
@@ -31 +33 @@
   public class Kursawe : MultiObjectiveTestFunction {
     protected override double[,] GetBounds(int objectives) {
-      return new double[,] { { -5, 5 } };
+      return new double[,] {{-5, 5}};
     }
 
@@ -38 +40 @@
     }
 
-    protected override IEnumerable<double[]> GetOptimalParetoFront(int objecitves) {
+    protected override IList<double[]> GetOptimalParetoFront(int objecitves) {
       return ParetoFrontStore.GetParetoFront("Misc.ParetoFronts." + this.ItemName);
     }
 
     protected override double GetBestKnownHypervolume(int objectives) {
-      return Hypervolume.Calculate(GetOptimalParetoFront(objectives), GetReferencePoint(objectives), GetMaximization(objectives));
+      return HypervolumeCalculator.CalculateHypervolume(GetOptimalParetoFront(objectives), GetReferencePoint(objectives), GetMaximization(objectives));
     }
 
     protected override double[] GetReferencePoint(int objectives) {
-      return new double[] { 11, 11 };
+      return new double[] {11, 11};
     }
 
@@ -57 +59 @@
     }
     public Kursawe() : base(minimumObjectives: 2, maximumObjectives: 2, minimumSolutionLength: 3, maximumSolutionLength: int.MaxValue) { }
-
-
-
 
 
@@ -75 +74 @@
       }
 
-      return new double[] { f0, f1 };
+      return new double[] {f0, f1};
     }
   }