Changeset 14068 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/Misc/ELLI1.cs

Timestamp:

07/14/16 14:33:15 (8 years ago)

Author:

mkommend

Message:

#1087: Added checks for min and max objectives to testfunctions.

Location:

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/Misc

Files:

• . (added)
• ELLI1.cs (moved) (moved from branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/ELLI1.cs) (2 diffs)

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/Misc/ELLI1.cs

@@ -30 +30 @@
   [StorableClass]
   public class ELLI : MultiObjectiveTestFunction {
-
-    public override double[,] Bounds(int objectives) {
+    protected override double[,] GetBounds(int objectives) {
       return new double[,] { { -10, 10 } };
     }
 
-    public override bool[] Maximization(int objecitves) {
+    protected override bool[] GetMaximization(int objecitves) {
       return new bool[2];
     }
 
-    public override double[] ReferencePoint(int objecitves) {
+    protected override double[] GetReferencePoint(int objecitves) {
       return new double[] { 11, 11 };
     }
 
-    public override IEnumerable<double[]> OptimalParetoFront(int objecitves) {
+    protected override IEnumerable<double[]> GetOptimalParetoFront(int objecitves) {
       List<double[]> res = new List<double[]>();
       for (int i = 0; i <= 500; i++) {
@@ -54 +53 @@
     }
 
-    public override double BestKnownHypervolume(int objectives) {
-      return Hypervolume.Calculate(OptimalParetoFront(objectives), ReferencePoint(objectives), Maximization(objectives));
+    protected override double GetBestKnownHypervolume(int objectives) {
+      return Hypervolume.Calculate(GetOptimalParetoFront(objectives), GetReferencePoint(objectives), GetMaximization(objectives));
     }