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

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/ZDT

Files:

• ZDT1.cs (modified) (1 diff)
• ZDT2.cs (modified) (1 diff)
• ZDT3.cs (modified) (1 diff)
• ZDT4.cs (modified) (2 diffs)
• ZDT6.cs (modified) (1 diff)

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT1.cs

@@ -44 +44 @@
     public override double[] Evaluate(RealVector r) {
       double g = 0;
-      for (int i = 1; i < r.Length; i++) g += r[i];
+      for (var i = 1; i < r.Length; i++) g += r[i];
       g = 1.0 + 9.0 * g / (r.Length - 1);
-      double f0 = r[0];
-      double f1 = g * (1.0 - Math.Sqrt(r[0] / g));
+      var f0 = r[0];
+      var f1 = g * (1.0 - Math.Sqrt(r[0] / g));
       return new double[] { f0, f1 };
     }

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT2.cs

@@ -42 +42 @@
     public override double[] Evaluate(RealVector r) {
       double g = 0;
-      for (int i = 1; i < r.Length; i++) g += r[i];
+      for (var i = 1; i < r.Length; i++) g += r[i];
       g = 1.0 + 9.0 * g / (r.Length - 1);
-      double d = r[0] / g;
-      double f0 = r[0];
-      double f1 = g * (1.0 - d * d);
+      var d = r[0] / g;
+      var f0 = r[0];
+      var f1 = g * (1.0 - d * d);
       return new double[] { f0, f1 };
     }

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT3.cs

@@ -44 +44 @@
     public override double[] Evaluate(RealVector r) {
       double g = 0;
-      for (int i = 1; i < r.Length; i++) g += r[i];
+      for (var i = 1; i < r.Length; i++) g += r[i];
       g = 1.0 + 9.0 * g / (r.Length - 1);
-      double d = r[0] / g;
-      double f0 = r[0];
-      double f1 = g * (1.0 - Math.Sqrt(d) - d * Math.Sin(10 * Math.PI * r[0]));
+      var d = r[0] / g;
+      var f0 = r[0];
+      var f1 = g * (1.0 - Math.Sqrt(d) - d * Math.Sin(10 * Math.PI * r[0]));
       return new double[] { f0, f1 };
     }

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT4.cs

@@ -30 +30 @@
   public class ZDT4 : ZDT {
     protected override double[,] GetBounds(int objectives) {
-      double[,] bounds = new double[objectives, 2];
+      var bounds = new double[objectives, 2];
       bounds[0, 0] = 0; bounds[0, 1] = 1;
-      for (int i = 1; i < objectives; i++) {
+      for (var i = 1; i < objectives; i++) {
         bounds[i, 0] = -5;
         bounds[i, 1] = 5;
@@ -53 +53 @@
     public override double[] Evaluate(RealVector r) {
       double g = 0;
-      for (int i = 1; i < r.Length; i++) {
-        double v = r[i];
+      for (var i = 1; i < r.Length; i++) {
+        var v = r[i];
         g += v * v - 10 * Math.Cos(4 * Math.PI * v);
       }
       g = 1.0 + 10.0 * (r.Length - 1) + g;
-      double d = r[0] / g;
-      double f0 = r[0];
-      double f1 = 1 - Math.Sqrt(d);
+      var d = r[0] / g;
+      var f0 = r[0];
+      var f1 = 1 - Math.Sqrt(d);
       return new double[] { f0, f1 };
     }

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT6.cs

@@ -43 +43 @@
     public override double[] Evaluate(RealVector r) {
       double g = 0;
-      for (int i = 1; i < r.Length; i++) g += r[i];
+      for (var i = 1; i < r.Length; i++) g += r[i];
       g = 1.0 + 9.0 * Math.Pow(g / (r.Length - 1), 0.25);
-      double f1 = 1 - Math.Exp(-4 * r[0]) * Math.Pow(Math.Sin(6 * Math.PI * r[0]), 6);
-      double d = f1 / g;
-      double f2 = g * (1.0 - d * d);
+      var f1 = 1 - Math.Exp(-4 * r[0]) * Math.Pow(Math.Sin(6 * Math.PI * r[0]), 6);
+      var d = f1 / g;
+      var f2 = g * (1.0 - d * d);
       return new double[] { f1, f2 };
     }