Changeset 14090 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions

Timestamp:

07/15/16 19:27:12 (8 years ago)

Author:

bwerth

Message:

#1087 several fixes according to the review comments 35 and 38

Location:

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

Files:

• IHR/IHR.cs (modified) (2 diffs)
• IHR/IHR1.cs (modified) (1 diff)
• IHR/IHR2.cs (modified) (1 diff)
• IHR/IHR3.cs (modified) (1 diff)
• IHR/IHR4.cs (modified) (1 diff)
• IHR/IHR6.cs (modified) (1 diff)
• Misc/ELLI1.cs (modified) (1 diff)
• Misc/SchafferN2.cs (modified) (1 diff)

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

@@ -52 +52 @@
         throw new ArgumentException("The dimensionality of the problem(ProblemSize) must be larger than or equal to the number of objectives");
       }
-      RealVector y = Y(r);
-      return new double[] { F1(y), F2(r, y) };
+      return new double[] { F1(r), F2(r) };
     }
     protected abstract double F1(RealVector y);
-    protected abstract double F2(RealVector r, RealVector y);
+    protected abstract double F2(RealVector y);
     protected abstract double G(RealVector y);
 
@@ -70 +69 @@
       return (x * x) / (Math.Abs(x) + 0.1);
     }
-    protected RealVector Y(RealVector x) {
-      return x;
-    }
   }
 }

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/IHR/IHR1.cs

@@ -58 +58 @@
     }
 
-    protected override double F2(RealVector r, RealVector y) {
+    protected override double F2(RealVector y) {
       var g = G(y);
       return g * HF(1 - Math.Sqrt(H(y[0], y) / g), y);

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/IHR/IHR2.cs

@@ -59 +59 @@
     }
 
-    protected override double F2(RealVector r, RealVector y) {
+    protected override double F2(RealVector y) {
       var g = G(y);
       var d = H(y[0], y) / g;

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/IHR/IHR3.cs

@@ -59 +59 @@
     }
 
-    protected override double F2(RealVector r, RealVector y) {
+    protected override double F2(RealVector y) {
       var g = G(y);
       var d = H(y[0], y) / g;

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/IHR/IHR4.cs

@@ -62 +62 @@
     }
 
-    protected override double F2(RealVector r, RealVector y) {
+    protected override double F2(RealVector y) {
       var g = G(y);
       var d = H(y[0], y) / g;

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/IHR/IHR6.cs

@@ -58 +58 @@
     }
 
-    protected override double F2(RealVector r, RealVector y) {
+    protected override double F2(RealVector y) {
       var g = G(y);
       var d = H(y[0], y) / g;

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

@@ -68 +68 @@
     public override double[] Evaluate(RealVector r, int objectives) {
       if (objectives != 2) throw new ArgumentException("The ELLI problem must always have 2 objectives");
-      double x = r[0];
       double a = 1000;
       double sum = 0.0;

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

@@ -44 +44 @@
 
     protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
-      throw new NotImplementedException();
+      return null;
     }