Changeset 17522 for branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding

Timestamp:

04/27/20 18:12:39 (4 years ago)

Author:

abeham

Message:

#2521 WIP refactoring:

1. Introduce nicer type IResultDefinition for API users to avoid complex IParameter interface (hide ActualValue)
2. Change result parameter to contexts (need quality and solution): only implemented for BinaryVectorProblem

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3

Files:

• IntegerVectorMultiObjectiveProblem.cs (modified) (4 diffs)
• IntegerVectorProblem.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorMultiObjectiveProblem.cs

@@ -33 +33 @@
   [StorableType("11916b0f-4c34-4ece-acae-e28d11211b43")]
   public abstract class IntegerVectorMultiObjectiveProblem : MultiObjectiveProblem<IntegerVectorEncoding, IntegerVector> {
+    [Storable] protected IResultParameter<ParetoFrontScatterPlot<IntegerVector>> BestResultParameter { get; private set; }
+    public IResultDefinition<ParetoFrontScatterPlot<IntegerVector>> BestResult { get { return BestResultParameter; } }
+
     public int Length {
       get { return Encoding.Length; }
@@ -47 +50 @@
     protected IntegerVectorMultiObjectiveProblem(IntegerVectorMultiObjectiveProblem original, Cloner cloner)
       : base(original, cloner) {
+      BestResultParameter = cloner.Clone(original.BestResultParameter);
       RegisterEventHandlers();
     }
@@ -53 +57 @@
     protected IntegerVectorMultiObjectiveProblem(IntegerVectorEncoding encoding) : base(encoding) {
       EncodingParameter.ReadOnly = true;
+      Parameters.Add(BestResultParameter = new ResultParameter<ParetoFrontScatterPlot<IntegerVector>>("Best Pareto Front", "The best Pareto front found."));
 
       Operators.Add(new HammingSimilarityCalculator());
@@ -66 +71 @@
       var fronts = DominationCalculator.CalculateAllParetoFrontsIndices(individuals, qualities, Maximization);
       var plot = new ParetoFrontScatterPlot<IntegerVector>(fronts, individuals, qualities, Objectives, BestKnownFront);
-      results.AddOrUpdateResult("Pareto Front Scatter Plot", plot);
+
+      BestResultParameter.ActualValue = plot;
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorProblem.cs

@@ -34 +34 @@
   [StorableType("c6081457-a3de-45ce-9f47-e0eb1c851bd2")]
   public abstract class IntegerVectorProblem : SingleObjectiveProblem<IntegerVectorEncoding, IntegerVector> {
+    [Storable] protected IResultParameter<IntegerVector> BestResultParameter { get; private set; }
+    public IResultDefinition<IntegerVector> BestResult { get => BestResultParameter; }
+
     public int Length {
       get { return Encoding.Length; }
@@ -48 +51 @@
     protected IntegerVectorProblem(IntegerVectorProblem original, Cloner cloner)
       : base(original, cloner) {
+      BestResultParameter = cloner.Clone(original.BestResultParameter);
       RegisterEventHandlers();
     }
@@ -54 +58 @@
     protected IntegerVectorProblem(IntegerVectorEncoding encoding) : base(encoding) {
       EncodingParameter.ReadOnly = true;
+      Parameters.Add(BestResultParameter = new ResultParameter<IntegerVector>("Best Solution", "The best solution."));
 
       Operators.Add(new HammingSimilarityCalculator());