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

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/Fonseca.cs

@@ -22 +22 @@
 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;
 
@@ -44 +46 @@
 
     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));
     }
 
@@ -65 +67 @@
 
       //objective1
-      for (int i = 0; i < r.Length; i++) {
-        double d = r[i] - aux;
+      for (var i = 0; i < r.Length; i++) {
+        var d = r[i] - aux;
         f0 += d * d;
       }
@@ -72 +74 @@
 
       //objective2
-      double f1 = 0.0;
-      for (int i = 0; i < r.Length; i++) {
-        double d = r[i] + aux;
+      var f1 = 0.0;
+      for (var i = 0; i < r.Length; i++) {
+        var d = r[i] + aux;
         f1 += d * d;
       }