Changeset 16950 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions

Timestamp:

05/13/19 22:56:49 (6 years ago)

Author:

abeham

Message:

#2521: Refactor Analyze method of encoding-specific problems, simplify Analyze of SO-TF

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/MultiObjectiveTestFunction.cs (modified) (10 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/MultiObjectiveTestFunction.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +28 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
@@ -71 +71 @@
     /// </summary>
     public bool[] Maximization(int objectives) {
-      CheckObjectives(objectives);
+      ThrowIfObjectivesOutOfRange(objectives);
       return GetMaximization(objectives);
     }
@@ -79 +79 @@
     /// </summary>
     public double[,] Bounds(int objectives) {
-      CheckObjectives(objectives);
+      ThrowIfObjectivesOutOfRange(objectives);
       return GetBounds(objectives);
     }
@@ -88 +88 @@
     /// </summary>
     public IEnumerable<double[]> OptimalParetoFront(int objectives) {
-      CheckObjectives(objectives);
+      ThrowIfObjectivesOutOfRange(objectives);
       return GetOptimalParetoFront(objectives);
     }
@@ -97 +97 @@
     /// </summary>
     public double[] ReferencePoint(int objectives) {
-      CheckObjectives(objectives);
+      ThrowIfObjectivesOutOfRange(objectives);
       return GetReferencePoint(objectives);
     }
@@ -106 +106 @@
     /// </summary>     
     public virtual double OptimalHypervolume(int objectives) {
-      CheckObjectives(objectives);
+      ThrowIfObjectivesOutOfRange(objectives);
       return GetBestKnownHypervolume(objectives);
     }
@@ -114 +114 @@
     }
 
-    protected void CheckObjectives(int objectives) {
+    protected void ThrowIfObjectivesOutOfRange(int objectives) {
       if (objectives < MinimumObjectives) throw new ArgumentException(string.Format("There must be at least {0} objectives", MinimumObjectives));
       if (objectives > MaximumObjectives) throw new ArgumentException(string.Format("There must be at most {0} objectives", MaximumObjectives));
@@ -121 +121 @@
     [StorableConstructor]
     protected MultiObjectiveTestFunction(StorableConstructorFlag _) : base(_) { }
-
     protected MultiObjectiveTestFunction(MultiObjectiveTestFunction original, Cloner cloner)
       : base(original, cloner) {
@@ -129 +128 @@
       MaximumSolutionLength = original.MaximumSolutionLength;
     }
-
     protected MultiObjectiveTestFunction(int minimumObjectives, int maximumObjectives, int minimumSolutionLength, int maximumSolutionLength)
       : base() {