Changeset 16310 for branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/MultiObjectiveTestFunctionProblem.cs

Timestamp:

11/20/18 14:53:51 (5 years ago)

Author:

bwerth

Message:

#2943 worked on MOBasicProblem and MOAnalyzers

Location:

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

Files:

• . (modified) (1 prop)
• 3.3/MultiObjectiveTestFunctionProblem.cs (modified) (7 diffs)

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/MultiObjectiveTestFunctionProblem.cs

@@ -39 +39 @@
     #region Parameter Properties
     public new IValueParameter<BoolArray> MaximizationParameter {
-      get { return (IValueParameter<BoolArray>)Parameters["Maximization"]; }
+      get { return (IValueParameter<BoolArray>)Parameters[MaximizationParameterName]; }
     }
     public IFixedValueParameter<IntValue> ProblemSizeParameter {
@@ -86 +86 @@
     }
 
-    protected MultiObjectiveTestFunctionProblem(MultiObjectiveTestFunctionProblem original, Cloner cloner)
-      : base(original, cloner) {
+    protected MultiObjectiveTestFunctionProblem(MultiObjectiveTestFunctionProblem original, Cloner cloner) : base(original, cloner) {
       RegisterEventHandlers();
     }
@@ -94 +93 @@
     }
 
-    public MultiObjectiveTestFunctionProblem()
-      : base() {
+    public MultiObjectiveTestFunctionProblem() : base() {
       Parameters.Add(new FixedValueParameter<IntValue>("ProblemSize", "The dimensionality of the problem instance (number of variables in the function).", new IntValue(2)));
       Parameters.Add(new FixedValueParameter<IntValue>("Objectives", "The dimensionality of the solution vector (number of objectives).", new IntValue(2)));
@@ -130 +128 @@
     public double[] CheckContraints(RealVector individual) {
       var constrainedTestFunction = (IConstrainedTestFunction)TestFunction;
-      if (constrainedTestFunction != null) {
-        return constrainedTestFunction.CheckConstraints(individual, Objectives);
-      }
-      return new double[0];
+      return constrainedTestFunction != null ? constrainedTestFunction.CheckConstraints(individual, Objectives) : new double[0];
     }
 
@@ -169 +164 @@
       ParameterizeAnalyzers();
     }
+
     protected override void OnEvaluatorChanged() {
       base.OnEvaluatorChanged();
@@ -199 +195 @@
     #region Helpers
     private void InitializeOperators() {
-      Operators.Add(new CrowdingAnalyzer());
-      Operators.Add(new GenerationalDistanceAnalyzer());
-      Operators.Add(new InvertedGenerationalDistanceAnalyzer());
-      Operators.Add(new HypervolumeAnalyzer());
-      Operators.Add(new SpacingAnalyzer());
+      Operators.Add(new Analysis.CrowdingAnalyzer());
+      Operators.Add(new Analysis.GenerationalDistanceAnalyzer());
+      Operators.Add(new Analysis.InvertedGenerationalDistanceAnalyzer());
+      Operators.Add(new Analysis.HypervolumeAnalyzer());
+      Operators.Add(new Analysis.SpacingAnalyzer());
+      Operators.Add(new Analysis.TimelineAnalyzer());
       Operators.Add(new ScatterPlotAnalyzer());
-
-      ParameterizeAnalyzers();
-    }
-
-    private IEnumerable<IMultiObjectiveTestFunctionAnalyzer> Analyzers {
-      get { return Operators.OfType<IMultiObjectiveTestFunctionAnalyzer>(); }
-    }
+      ParameterizeAnalyzers();
+    }
+
+    private IEnumerable<IMultiObjectiveTestFunctionAnalyzer> Analyzers => Operators.OfType<IMultiObjectiveTestFunctionAnalyzer>();
 
     private void ParameterizeAnalyzers() {
@@ -219 +213 @@
         analyzer.TestFunctionParameter.ActualName = TestFunctionParameter.Name;
         analyzer.BestKnownFrontParameter.ActualName = BestKnownFrontParameter.Name;
-
-        var scatterPlotAnalyzer = analyzer as ScatterPlotAnalyzer;
-        if (scatterPlotAnalyzer != null) {
+        if (analyzer is ScatterPlotAnalyzer scatterPlotAnalyzer) 
           scatterPlotAnalyzer.IndividualsParameter.ActualName = Encoding.Name;
-        }
       }
     }
-
     #endregion
   }