Changeset 16807 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/MultiObjectiveTestFunctionProblem.cs

Timestamp:

04/17/19 23:07:03 (5 years ago)

Author:

mkommend

Message:

#2521: Adapted test functions to new architecture and partly MOCMAES.

File:

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

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

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +29 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Problems.Instances;
 
@@ -35 +35 @@
   [Creatable(CreatableAttribute.Categories.Problems, Priority = 95)]
   [Item("Test Function (multi-objective)", "Test functions with real valued inputs and multiple objectives.")]
-  public class MultiObjectiveTestFunctionProblem : MultiObjectiveBasicProblem<RealVectorEncoding>, IProblemInstanceConsumer<MOTFData> {
+  public class MultiObjectiveTestFunctionProblem : MultiObjectiveProblem<RealVectorEncoding, RealVector>, IProblemInstanceConsumer<MOTFData> {
 
     #region Parameter Properties
-    public IValueParameter<BoolArray> MaximizationParameter {
-      get { return (IValueParameter<BoolArray>)Parameters["Maximization"]; }
-    }
     public IFixedValueParameter<IntValue> ProblemSizeParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters["ProblemSize"]; }
@@ -65 +62 @@
     public override bool[] Maximization {
       get {
-        if (!Parameters.ContainsKey("Maximization")) return new bool[2];
-        return MaximizationParameter.Value.ToArray();
+        //necessary because of virtual member call in base ctor
+        if (!Parameters.ContainsKey("TestFunction")) return new bool[0];
+        return TestFunction.Maximization(Objectives).ToArray();
       }
     }
@@ -136 +134 @@
 
 
-    public override void Analyze(Individual[] individuals, double[][] qualities, ResultCollection results, IRandom random) {
-      base.Analyze(individuals, qualities, results, random);
+    public override void Analyze(RealVector[] solutions, double[][] qualities, ResultCollection results, IRandom random) {
+      base.Analyze(solutions, qualities, results, random);
       if (results.ContainsKey("Pareto Front")) {
         ((DoubleMatrix)results["Pareto Front"].Value).SortableView = true;
@@ -156 +154 @@
     }
 
-    public double[] Evaluate(RealVector individual) {
-      return TestFunction.Evaluate(individual, Objectives);
-    }
-
-    public override double[] Evaluate(Individual individual, IRandom random) {
-      return Evaluate(individual.RealVector());
-    }
+    public override double[] Evaluate(RealVector solution, IRandom random) {
+      return TestFunction.Evaluate(solution, Objectives);
+    }
+
 
     public void Load(MOTFData data) {