Changeset 13620 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/SchafferN1.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/Testfunctions/SchafferN1.cs (modified) (4 diffs)

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/SchafferN1.cs

@@ -1 @@
-using HeuristicLab.Common;
+using System;
+using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -10 +12 @@
   public class SchafferN1 : MultiObjectiveTestFunction {
 
-    public override DoubleMatrix Bounds {
-      get {
-        return new DoubleMatrix(new double[,] { { -1e5, 1e5 } });
-      }
+    public override double[,] Bounds(int objectives) {
+      return new double[,] { { -1e5, 1e5 } };
     }
 
-    public override bool[] Maximization {
-      get {
-        return new bool[] { false, false };
-      }
+    public override bool[] Maximization(int objecitves) {
+      return new bool[2];
     }
 
-    public override int MaximumProblemSize {
-      get {
-        return 1;
-      }
+    public override int MinimumSolutionLength {
+      get { return 1; }
+    }
+    public override int MaximumSolutionLength {
+      get { return 1; }
     }
 
-    public override int MaximumSolutionSize {
-      get {
-        return 2;
-      }
+
+    public override int MinimumObjectives {
+      get { return 2; }
     }
 
-    public override int MinimumProblemSize {
-      get {
-        return 1;
-      }
+    public override int MaximumObjectives {
+      get { return 2; }
     }
 
-    public override int MinimumSolutionSize {
-      get {
-        return 2;
-      }
+
+    public override double[] ReferencePoint(int objecitves) {
+        return new double[] { 1e5, 1e5 };
     }
 
-    public override int ActualSolutionSize {
-      get {
-        return 2;
-      }
 
-      set {
-      }
+    public override IEnumerable<double[]> OptimalParetoFront(int objecitves) {
+        return PFStore.get("Schaffer");
     }
+    public override double BestKnownHypervolume(int objecitves) {
+        return new Hypervolume(ReferencePoint(objecitves), Maximization(2)).GetHypervolume(OptimalParetoFront(objecitves));
 
-    public override RealVector[] OptimalParetoFront {
-      get {
-        return PFReader.getFromFile("SchafferN1");
-      }
-    }
-    public override double BestKnownHypervolume {
-      get {
-        return new Hypervolume(base.ReferencePoint, Maximization).GetHypervolume(OptimalParetoFront);
-      }
     }
 
@@ -69 +53 @@
     protected SchafferN1(bool deserializing) : base(deserializing) { }
     protected SchafferN1(SchafferN1 original, Cloner cloner) : base(original, cloner) { }
-    public SchafferN1() : base() { }
-
     public override IDeepCloneable Clone(Cloner cloner) {
       return new SchafferN1(this, cloner);
     }
 
+    public SchafferN1() : base() { }
 
 
-    public override double[] Evaluate(RealVector r) {
+
+
+
+    public override double[] Evaluate(RealVector r, int objectives) {
+      if (objectives != 2) throw new ArgumentException("The Schaffer N1 problem must always have 2 objectives");
       if (r.Length != 1) return null;
       double x = r[0];
@@ -88 +75 @@
       f1 *= f1;
 
-     return new double[] { f0, f1 };
+      return new double[] { f0, f1 };
     }
   }