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

Timestamp:

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

Author:

bwerth

Message:

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

Location:

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

Files:

• CIGTAB.cs (modified) (6 diffs)
• ELLI1.cs (modified) (4 diffs)
• Fonseca.cs (modified) (4 diffs)
• Kursawe.cs (modified) (3 diffs)
• SchafferN1.cs (modified) (3 diffs)
• SchafferN2.cs (modified) (2 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 };

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/ELLI1.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));
     }
 
@@ -69 +71 @@
       if (objectives != 2) throw new ArgumentException("The ELLI problem must always have 2 objectives");
       double a = 1000;
-      double sum = 0.0;
-      for (int i = 0; i < r.Length; i++) {
+      var sum = 0.0;
+      for (var i = 0; i < r.Length; i++) {
         sum += Math.Pow(a, 2 * i / (r.Length - 1)) * r[i] * r[i];
       }
 
       //objective1
-      double f0 = 1 / (a * a * r.Length) * sum;
+      var f0 = 1 / (a * a * r.Length) * sum;
 
       sum = 0.0;
-      for (int i = 0; i < r.Length; i++) {
+      for (var i = 0; i < r.Length; i++) {
         sum += Math.Pow(a, 2 * i / (r.Length - 1)) * (r[i] - 2) * (r[i] - 2);
       }
       //objective0
-      double f1 = 1 / (a * a * r.Length) * sum;
+      var f1 = 1 / (a * a * r.Length) * sum;
 
       return new double[] { f0, f1 };

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;
       }

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/Kursawe.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 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 @@
       if (objectives != 2) throw new ArgumentException("The Kursawe problem must always have 2 objectives");
       //objective 1
-      double f0 = 0.0;
-      for (int i = 0; i < r.Length - 1; i++) {
+      var f0 = 0.0;
+      for (var 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 < r.Length; i++) {
+      var f1 = 0.0;
+      for (var i = 0; i < r.Length; i++) {
         f1 += Math.Pow(Math.Abs(r[i]), 0.8) + 5 * Math.Sin(Math.Pow(r[i], 3));
       }

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/SchafferN1.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;
 
@@ -48 +50 @@
 
     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));
     }
 
@@ -63 +65 @@
       if (objectives != 2) throw new ArgumentException("The Schaffer N1 problem must always have 2 objectives");
       if (r.Length != 1) return null;
-      double x = r[0];
+      var x = r[0];
 
       //objective1
-      double f0 = x * x;
+      var f0 = x * x;
 
       //objective0
-      double f1 = x - 2;
+      var f1 = x - 2;
       f1 *= f1;
 

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

@@ -59 +59 @@
     public override double[] Evaluate(RealVector r, int objectives) {
       if (objectives != 2) throw new ArgumentException("The Schaffer N1 problem must always have 2 objectives");
-      double x = r[0];
+      var x = r[0];
 
       //objective1
@@ -69 +69 @@
 
       //objective0
-      double f1 = x - 5;
+      var f1 = x - 5;
       f1 *= f1;