Changeset 16171 for branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR6.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/IHR/IHR6.cs (modified) (3 diffs)

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR6.cs

@@ -21 +21 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -31 +32 @@
   public class IHR6 : IHR {
     protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
-      List<double[]> res = new List<double[]>();
-      for (int i = 0; i <= 500; i++) {
-        RealVector r = new RealVector(objectives);
+      var res = new List<double[]>();
+      for (var i = 0; i <= 500; i++) {
+        var r = new RealVector(objectives);
         r[0] = 1 / 500.0 * i;
         res.Add(this.Evaluate(r, objectives));
       }
       return res;
-    }
-
-    protected override double GetBestKnownHypervolume(int objectives) {
-      return Hypervolume.Calculate(GetOptimalParetoFront(objectives), GetReferencePoint(objectives), GetMaximization(objectives));
     }
 
@@ -65 +62 @@
 
     protected override double G(RealVector y) {
-      double sum = 0.0;
-      for (int i = 1; i < y.Length; i++) {
+      var sum = 0.0;
+      for (var i = 1; i < y.Length; i++) {
         sum += HG(y[i]);
       }