Changeset 13515 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/Kursawe.cs

Timestamp:

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

Author:

bwerth

Message:

#1087 minor bugfixes and added unittests

File:

• branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/Kursawe.cs (modified) (4 diffs)

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -9 +5 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.MultiObjectiveTestFunction;
 
-namespace HeuristicLab.Problems.TestFunctions {
-  [Item("Kursawe", "from // http://darwin.di.uminho.pt/jecoli/index.php/Multiobjective_example [30.11.2015]")]
+namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
+  [Item("Kursawe", "Kursawe function from // http://darwin.di.uminho.pt/jecoli/index.php/Multiobjective_example [30.11.2015]")]
   [StorableClass]
   public class Kursawe : MultiObjectiveTestFunction {
@@ -61 +56 @@
     }
 
+    public override RealVector[] OptimalParetoFront {
+      get {
+        return PFReader.getFromFile("Kursawe");
+      }
+    }
+    public override double BestKnownHypervolume {
+      get {
+        return new Hypervolume(base.ReferencePoint, Maximization).GetHypervolume(OptimalParetoFront);
+      }
+    }
+
     [StorableConstructor]
     protected Kursawe(bool deserializing) : base(deserializing) { }
@@ -75 +81 @@
       //objective 1
       double f0 = 0.0;
-      for (int i = 0; i < 2; i++) {
+      for (int i = 0; i < r.Length-1; i++) {
         f0 += -10 * Math.Exp(-0.2 * Math.Sqrt(r[i] * r[i] + r[i + 1] * r[i + 1]));
       }
       //objective2
       double f1 = 0.0;
-      for (int i = 0; i < 3; i++) {
+      for (int i = 0; i < r.Length; i++) {
         f1 += Math.Pow(Math.Abs(r[i]), 0.8) + 5 * Math.Sin(Math.Pow(r[i], 3));
       }