Changeset 13451 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/DTLZ7.cs

Timestamp:

12/11/15 15:19:24 (8 years ago)

Author:

bwerth

Message:

#1087 extensive testing; fixed minor bugs

File:

• branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/DTLZ7.cs (modified) (7 diffs)

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/DTLZ7.cs

@@ -17 +17 @@
   public class DTLZ7 : MultiObjectiveTestFunction {
 
+    private int actualSolutionSize = 2;
+    public override int ActualSolutionSize {
+      get {
+        return actualSolutionSize;
+      }
+
+      set {
+        actualSolutionSize = value;
+      }
+    }
+
     public override DoubleMatrix Bounds {
       get {
@@ -25 +36 @@
     public override bool[] Maximization {
       get {
-        bool[] res = new bool[((ValueParameter<IntValue>)Parameters["SolutionSize"]).Value.Value];
-        for(int i =0; i < res.Length; i++)  res[i] = false; //TODO: diligent initialzation
-        return res;
+        return new bool[actualSolutionSize];
       }
     }
@@ -37 +46 @@
     }
 
-    public override int MaximumSolutionSize { //TODO ask Michael
+    public override int MaximumSolutionSize {
       get {
-        return ((ValueParameter<IntValue>)Parameters["ProblemSize"]).Value.Value;
+
+        return int.MaxValue;
       }
     }
@@ -45 +55 @@
     public override int MinimumProblemSize {
       get {
-        return 2;
+        return Math.Max(2, ActualSolutionSize*10);
       }
     }
@@ -52 +62 @@
       get {
         return 2;
-      }
-    }
-
-    public override int ActualSolutionSize {
-      get {
-        throw new NotImplementedException();
-      }
-
-      set {
-        throw new NotImplementedException();
       }
     }
@@ -77 +77 @@
 
     public override double[] Evaluate(RealVector r) {
-      return Evaluate(r, ((ValueParameter<IntValue>)Parameters["SolutionSize"]).Value.Value);
+      return Evaluate(r, ActualSolutionSize);
     }
 
     private double[] Evaluate(RealVector r, int objectives) {
+      if (r.Length < objectives) {
+        throw new Exception("The dimensionality of the problem(ProblemSize) must be larger than or equal to ten times the dimensionality of the solution(SolutionSize) ");
+      }
       double[] res = new double[objectives];
 
       //calculate f0...fM-1;
       double n = 10 * objectives;
-      for (int i = 0; i < objectives; i++) {
+      for (int i = 1; i <= objectives; i++) {
         double d = 0;
-        for (int j = (int)Math.Floor((i - 1) * n / objectives); j < (int)Math.Floor(i * n / objectives); j++) {
+        int c = 0;
+        for (int j = (int)Math.Floor((i - 1) * n / objectives); j < Math.Min((int)Math.Floor(i * n / objectives), r.Length); j++) {
           d += r[j];
+          c++;
         }
-        d *= 1 / Math.Floor(n / objectives);
-        res[i] = d;
+        d *= 1.0 / c;
+        res[i-1] = d;
       }
 
       //evaluate constraints g0...gM-2
       for (int i = 0; i < objectives - 1; i++) {
-        if (res[objectives - 1] + 4 * res[i] - 1 < 0) return null; //TODO null is not the way to go
+        if (res[objectives - 1] + 4 * res[i] - 1 < 0) return MultiObjectiveTestFunction.IllegalValue(objectives,Maximization); 
       }
       //evaluate gM-1
@@ -103 +108 @@
         for (int j = 0; j < i; j++) min = Math.Min(min, res[i] + res[j]);
       };
-      if (2 * res[objectives - 1] + min - 1 < 0) return null;  //TODO null is not the way to go
+      if (2 * res[objectives - 1] + min - 1 < 0) return MultiObjectiveTestFunction.IllegalValue(objectives, Maximization); 
 
       return res;