Changeset 16806 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveProblem.cs

Timestamp:

04/17/19 23:06:18 (5 years ago)

Author:

mkommend

Message:

#2521: Added StorableType attributes to interfaces and adapted basic problems.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveProblem.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveProblem.cs

@@ -36 +36 @@
     where TEncodedSolution : class, IEncodedSolution {
 
+    protected IValueParameter<BoolArray> MaximizationParameter {
+      get { return (IValueParameter<BoolArray>)Parameters["Maximization"]; }
+    }
+
     [StorableConstructor]
     protected MultiObjectiveProblem(StorableConstructorFlag _) : base(_) { }
@@ -44 +48 @@
     }
 
-    protected MultiObjectiveProblem()
-      : base() {
+    protected MultiObjectiveProblem() : base() {
+      Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", (BoolArray)new BoolArray(Maximization).AsReadOnly()));
+
+      Operators.Add(Evaluator);
+      Operators.Add(new MultiObjectiveAnalyzer<TEncodedSolution>());
+
+      ParameterizeOperators();
+    }
+
+    protected MultiObjectiveProblem(TEncoding encoding) : base(encoding) {
       Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", (BoolArray)new BoolArray(Maximization).AsReadOnly()));
 
@@ -59 +71 @@
     }
 
+    public int Objectives => Maximization.Length;
     public abstract bool[] Maximization { get; }
-    public abstract double[] Evaluate(TEncodedSolution individual, IRandom random);
-    public virtual void Analyze(TEncodedSolution[] individuals, double[][] qualities, ResultCollection results, IRandom random) { }
+    public abstract double[] Evaluate(TEncodedSolution solution, IRandom random);
+    public virtual void Analyze(TEncodedSolution[] solutions, double[][] qualities, ResultCollection results, IRandom random) { }
 
     protected override void OnOperatorsChanged() {