Changeset 17315 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable

Timestamp:

10/04/19 14:23:08 (5 years ago)

Author:

abeham

Message:

#2521: reverted r17309

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3

Files:

• CompiledProblemDefinition.cs (modified) (2 diffs)
• MultiObjectiveProblemDefinitionScript.cs (modified) (2 diffs)
• MultiObjectiveProgrammableProblem.cs (modified) (2 diffs)
• Templates/MultiObjectiveCombinedEncodingProblem_Template.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/CompiledProblemDefinition.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 
@@ -77 +78 @@
 
     #region ISingleObjectiveProblemDefinition<TEncoding,TEncodedSolution> Members
-    public int Objectives => Maximization.Count;
-    public abstract IReadOnlyList<bool> Maximization { get; }
+    public int Objectives => Maximization.Length;
+    public abstract bool[] Maximization { get; }
     public abstract IReadOnlyList<double[]> BestKnownFront { get; }
     public abstract double[] ReferencePoint { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProblemDefinitionScript.cs

@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 
@@ -51 +52 @@
     public IReadOnlyList<double[]> BestKnownFront => CompiledProblemDefinition.BestKnownFront;
     public double[] ReferencePoint => CompiledProblemDefinition.ReferencePoint;
-    public IReadOnlyList<bool> Maximization => CompiledProblemDefinition.Maximization;
+    public bool[] Maximization => CompiledProblemDefinition.Maximization;
 
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

@@ -94 +94 @@
 
     private void OnProblemDefinitionChanged() {
-      Maximization = new BoolArray(ProblemDefinition.Maximization);
+      Parameters.Remove("Maximization");
+      Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", (BoolArray)new BoolArray(Maximization).AsReadOnly()) {Hidden = true});
       Encoding = (TEncoding)ProblemScript.Encoding.Clone();
 
@@ -106 +107 @@
     private void OnProblemScriptNameChanged() {
       Name = ProblemScript.Name;
+    }
+
+    public override bool[] Maximization {
+      get { return Parameters.ContainsKey("ProblemScript") ? ProblemDefinition.Maximization : new[] {false}; }
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/Templates/MultiObjectiveCombinedEncodingProblem_Template.cs

@@ -16 +16 @@
 namespace HeuristicLab.Problems.Programmable {
   public class CompiledMultiObjectiveProblemDefinition : CompiledMultiObjectiveProblemDefinition<CombinedEncoding, CombinedSolution> {
-    public override IReadOnlyList<bool> Maximization { get { return new[] { true, false }; } }
+    public override bool[] Maximization { get { return new[] { true, false }; } }
     public override double[] ReferencePoint { get { return null; } }
     public override IReadOnlyList<double[]> BestKnownFront { get { return null; } }