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

Timestamp:

08/29/19 13:53:26 (5 years ago)

Author:

mkommend

Message:

#2521: Integrated changes of #2943 into problem refactoring branch.

Location:

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

Files:

• CompiledProblemDefinition.cs (modified) (4 diffs)
• MultiObjectiveProblemDefinitionScript.cs (modified) (2 diffs)
• MultiObjectiveProgrammableProblem.cs (modified) (5 diffs)
• SingleObjectiveProblemDefinitionScript.cs (modified) (2 diffs)
• Templates/MultiObjectiveCombinedEncodingProblem_Template.cs (modified) (1 diff)
• Templates/MultiObjectiveProblem_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;
 
@@ -51 +52 @@
     where TEncoding : class, IEncoding<TEncodedSolution>
     where TEncodedSolution : class, IEncodedSolution {
-
     protected CompiledSingleObjectiveProblemDefinition() : base() { }
 
@@ -72 +72 @@
     where TEncoding : class, IEncoding<TEncodedSolution>
     where TEncodedSolution : class, IEncodedSolution {
-
     protected CompiledMultiObjectiveProblemDefinition() : base() { }
 
@@ -79 +78 @@
 
     #region ISingleObjectiveProblemDefinition<TEncoding,TEncodedSolution> Members
-
     public int Objectives => Maximization.Length;
     public abstract bool[] Maximization { get; }
+    public abstract IReadOnlyList<double[]> BestKnownFront { get; }
+    public abstract double[] ReferencePoint { get; }
     public abstract double[] Evaluate(TEncodedSolution individual, IRandom random);
     public abstract void Analyze(TEncodedSolution[] individuals, double[][] qualities, ResultCollection results, IRandom random);

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

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 
@@ -47 +49 @@
     }
 
-    int IMultiObjectiveProblemDefinition<TEncoding, TEncodedSolution>.Objectives => CompiledProblemDefinition.Objectives;
+    public int Objectives => CompiledProblemDefinition.Objectives;
+    public IReadOnlyList<double[]> BestKnownFront => CompiledProblemDefinition.BestKnownFront;
+    public double[] ReferencePoint => CompiledProblemDefinition.ReferencePoint;
+    public bool[] Maximization => CompiledProblemDefinition.Maximization;
 
-    bool[] IMultiObjectiveProblemDefinition<TEncoding, TEncodedSolution>.Maximization {
-      get { return CompiledProblemDefinition.Maximization; }
-    }
 
     double[] IMultiObjectiveProblemDefinition<TEncoding, TEncodedSolution>.Evaluate(TEncodedSolution individual, IRandom random) {

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

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Drawing;
 using HEAL.Attic;
@@ -59 +60 @@
     }
 
+
     [StorableConstructor]
     protected MultiObjectiveProgrammableProblem(StorableConstructorFlag _) : base(_) { }
@@ -69 +71 @@
       : base(encoding) {
       Parameters.Add(new FixedValueParameter<MultiObjectiveProblemDefinitionScript<TEncoding, TEncodedSolution>>("ProblemScript", "Defines the problem.",
-        new MultiObjectiveProblemDefinitionScript<TEncoding, TEncodedSolution>() { Name = Name }));
+        new MultiObjectiveProblemDefinitionScript<TEncoding, TEncodedSolution>() {Name = Name}));
       ProblemScript.Encoding = (TEncoding)encoding.Clone();
 
@@ -93 +95 @@
     private void OnProblemDefinitionChanged() {
       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 });
+      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();
 
@@ -108 +110 @@
 
     public override bool[] Maximization {
-      get { return Parameters.ContainsKey("ProblemScript") ? ProblemDefinition.Maximization : new[] { false }; }
+      get { return Parameters.ContainsKey("ProblemScript") ? ProblemDefinition.Maximization : new[] {false}; }
+    }
+
+    public override IReadOnlyList<double[]> BestKnownFront {
+      get { return Parameters.ContainsKey("ProblemScript") ? ProblemDefinition.BestKnownFront : null; }
+    }
+
+    public override double[] ReferencePoint {
+      get { return Parameters.ContainsKey("ProblemScript") ? ProblemDefinition.ReferencePoint : null; }
     }
 

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

@@ -48 +48 @@
     }
 
-    bool ISingleObjectiveProblemDefinition<TEncoding, TEncodedSolution>.Maximization {
-      get { return CompiledProblemDefinition.Maximization; }
-    }
+    public bool Maximization => CompiledProblemDefinition.Maximization;
 
     double ISingleObjectiveProblemDefinition<TEncoding, TEncodedSolution>.Evaluate(TEncodedSolution individual, IRandom random) {
@@ -63 +61 @@
     }
 
-    bool ISingleObjectiveProblemDefinition<TEncoding, TEncodedSolution>.IsBetter(double quality, double bestQuality) {
+    public bool IsBetter(double quality, double bestQuality) {
       return CompiledProblemDefinition.IsBetter(quality, bestQuality);
     }

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

@@ -17 +17 @@
   public class CompiledMultiObjectiveProblemDefinition : CompiledMultiObjectiveProblemDefinition<CombinedEncoding, CombinedSolution> {
     public override bool[] Maximization { get { return new[] { true, false }; } }
+    public override double[] ReferencePoint { get { return null; } }
+    public override IReadOnlyList<double[]> BestKnownFront { get { return null; } }
 
     public override void Initialize() {

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

@@ -12 +12 @@
   public class CompiledMultiObjectiveProblemDefinition : CompiledMultiObjectiveProblemDefinition<ENCODING_CLASS, SOLUTION_CLASS> {
     public override bool[] Maximization { get { return new[] { false, false }; } }
+    public override double[] ReferencePoint { get { return null; } }
+    public override IReadOnlyList<double[]> BestKnownFront { get { return null; } }
 
     public override void Initialize() {