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

Timestamp:

09/15/20 17:09:10 (4 years ago)

Author:

abeham

Message:

#2521: worked on refactoring

• add results to problem base classes
• fix external evaluation problem
• Add result descriptions

Location:

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

Files:

• IntegerVectorMultiObjectiveProblem.cs (modified) (5 diffs)
• IntegerVectorProblem.cs (modified) (5 diffs)

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

@@ -35 +35 @@
   [StorableType("11916b0f-4c34-4ece-acae-e28d11211b43")]
   public abstract class IntegerVectorMultiObjectiveProblem : MultiObjectiveProblem<IntegerVectorEncoding, IntegerVector> {
-    [Storable] protected IResultParameter<ParetoFrontScatterPlot<IntegerVector>> BestResultParameter { get; private set; }
     [Storable] protected ReferenceParameter<IntValue> DimensionRefParameter { get; private set; }
     [Storable] protected ReferenceParameter<IntMatrix> BoundsRefParameter { get; private set; }
+    [Storable] public IResult<ParetoFrontScatterPlot<IntegerVector>> BestParetoFrontResult { get; private set; }
 
     public int Dimension {
@@ -49 +49 @@
     }
 
+    protected ParetoFrontScatterPlot<IntegerVector> BestParetoFront {
+      get => BestParetoFrontResult.Value;
+      set => BestParetoFrontResult.Value = value;
+    }
+
     [StorableConstructor]
     protected IntegerVectorMultiObjectiveProblem(StorableConstructorFlag _) : base(_) { }
@@ -58 +63 @@
     protected IntegerVectorMultiObjectiveProblem(IntegerVectorMultiObjectiveProblem original, Cloner cloner)
       : base(original, cloner) {
-      BestResultParameter = cloner.Clone(original.BestResultParameter);
       DimensionRefParameter = cloner.Clone(original.DimensionRefParameter);
       BoundsRefParameter = cloner.Clone(original.BoundsRefParameter);
+      BestParetoFrontResult = cloner.Clone(original.BestParetoFrontResult);
       RegisterEventHandlers();
     }
@@ -68 +73 @@
       EncodingParameter.ReadOnly = true;
       EvaluatorParameter.ReadOnly = true;
-      Parameters.Add(BestResultParameter = new ResultParameter<ParetoFrontScatterPlot<IntegerVector>>("Best Pareto Front", "The best Pareto front found."));
       Parameters.Add(DimensionRefParameter = new ReferenceParameter<IntValue>("Dimension", "The dimension of the integer vector problem.", Encoding.LengthParameter));
       Parameters.Add(BoundsRefParameter = new ReferenceParameter<IntMatrix>("Bounds", "The bounds of the integer vector problem.", Encoding.BoundsParameter));
+      Results.Add(BestParetoFrontResult = new Result<ParetoFrontScatterPlot<IntegerVector>>("Best Pareto Front", "The best Pareto front found so far."));
 
       Operators.Add(new HammingSimilarityCalculator());
@@ -85 +90 @@
       var plot = new ParetoFrontScatterPlot<IntegerVector>(fronts, individuals, qualities, Objectives, BestKnownFront);
 
-      BestResultParameter.ActualValue = plot;
+      BestParetoFront = plot;
     }
 

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

@@ -36 +36 @@
   [StorableType("c6081457-a3de-45ce-9f47-e0eb1c851bd2")]
   public abstract class IntegerVectorProblem : SingleObjectiveProblem<IntegerVectorEncoding, IntegerVector> {
-    [Storable] protected IResultParameter<IntegerVector> BestResultParameter { get; private set; }
     [Storable] protected ReferenceParameter<IntValue> DimensionRefParameter { get; private set; }
     [Storable] protected ReferenceParameter<IntMatrix> BoundsRefParameter { get; private set; }
+    [Storable] public IResult<ISingleObjectiveSolutionContext<IntegerVector>> BestSolutionResult { get; private set; }
 
     public int Dimension {
@@ -50 +50 @@
     }
 
+    protected ISingleObjectiveSolutionContext<IntegerVector> BestSolution {
+      get => BestSolutionResult.Value;
+      set => BestSolutionResult.Value = value;
+    }
+
     [StorableConstructor]
     protected IntegerVectorProblem(StorableConstructorFlag _) : base(_) { }
@@ -59 +64 @@
     protected IntegerVectorProblem(IntegerVectorProblem original, Cloner cloner)
       : base(original, cloner) {
-      BestResultParameter = cloner.Clone(original.BestResultParameter);
       DimensionRefParameter = cloner.Clone(original.DimensionRefParameter);
       BoundsRefParameter = cloner.Clone(original.BoundsRefParameter);
+      BestSolutionResult = cloner.Clone(original.BestSolutionResult);
       RegisterEventHandlers();
     }
@@ -69 +74 @@
       EncodingParameter.ReadOnly = true;
       EvaluatorParameter.ReadOnly = true;
-      Parameters.Add(BestResultParameter = new ResultParameter<IntegerVector>("Best Solution", "The best solution."));
       Parameters.Add(DimensionRefParameter = new ReferenceParameter<IntValue>("Dimension", "The dimension of the integer vector problem.", Encoding.LengthParameter));
       Parameters.Add(BoundsRefParameter = new ReferenceParameter<IntMatrix>("Bounds", "The bounding box and step sizes of the values.", Encoding.BoundsParameter));
+      Results.Add(BestSolutionResult = new Result<ISingleObjectiveSolutionContext<IntegerVector>>("Best Solution", "The best solution found so far."));
 
       Operators.Add(new HammingSimilarityCalculator());
@@ -82 +87 @@
     }
 
-    public override void Analyze(ISingleObjectiveSolutionContext<IntegerVector>[] solutionContext, IRandom random) {
-      base.Analyze(solutionContext, random);
-
-      var best = GetBest(solutionContext);
-
-      //TODO reimplement code below using results directly
-      //results.AddOrUpdateResult("Best Solution", (IntegerVector)best.EncodedSolution.Clone());
+    public override void Analyze(ISingleObjectiveSolutionContext<IntegerVector>[] solutionContexts, IRandom random) {
+      base.Analyze(solutionContexts, random);
+      var best = GetBest(solutionContexts);
+      if (BestSolution == null || IsBetter(best, BestSolution))
+        BestSolution = best.Clone() as SingleObjectiveSolutionContext<IntegerVector>;
     }