Changeset 16171 for branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/CIGTAB.cs

Timestamp:

09/21/18 09:18:49 (6 years ago)

Author:

bwerth

Message:

#2943 worked on MOBasicProblem - added Interfaces;reworked MOCalculators; several minor changes

File:

• branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/CIGTAB.cs (modified) (6 diffs)

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/CIGTAB.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 HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -43 +45 @@
 
     protected override IEnumerable<double[]> GetOptimalParetoFront(int objecitves) {
-      List<double[]> res = new List<double[]>();
-      for (int i = 0; i <= 500; i++) {
-        RealVector r = new RealVector(2);
+      var res = new List<double[]>();
+      for (var i = 0; i <= 500; i++) {
+        var r = new RealVector(2);
         r[0] = 2 / 500.0 * i;
         r[1] = 2 / 500.0 * i;
@@ -54 +56 @@
 
     protected override double GetBestKnownHypervolume(int objectives) {
-      return Hypervolume.Calculate(GetOptimalParetoFront(objectives), GetReferencePoint(objectives), GetMaximization(objectives));
+      return HypervolumeCalculator.CalculateHypervolume(GetOptimalParetoFront(objectives).ToArray(), GetReferencePoint(objectives), GetMaximization(objectives));
     }
 
@@ -68 +70 @@
     public override double[] Evaluate(RealVector r, int objectives) {
       if (objectives != 2) throw new ArgumentException("The CIGTAB problem must always have 2 objectives");
-      double x = r[0];
+      var x = r[0];
       double a = 1000;
-      double sum = x * x;
-      for (int i = 1; i < r.Length - 1; i++) {
+      var sum = x * x;
+      for (var i = 1; i < r.Length - 1; i++) {
         sum += a * r[i] * r[i];
       }
@@ -77 +79 @@
 
       //objective1
-      double f0 = 1 / (a * a * r.Length) * sum;
+      var f0 = 1 / (a * a * r.Length) * sum;
 
       x = x - 2;
       sum = x * x;
-      for (int i = 1; i < r.Length - 1; i++) {
+      for (var i = 1; i < r.Length - 1; i++) {
         sum += a * (r[i] - 2) * (r[i] - 2);
       }
@@ -87 +89 @@
       sum += a * a * (r[r.Length - 1] - 2) * (r[r.Length - 1] - 2);
       //objective0
-      double f1 = 1 / (a * a * r.Length) * sum;
+      var f1 = 1 / (a * a * r.Length) * sum;
 
       return new double[] { f0, f1 };