Changeset 17522 for branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorProblem.cs

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

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorProblem.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorProblem.cs

@@ -33 +33 @@
   [StorableType("2F6FEB34-BD19-47AF-9484-7F48565C0C43")]
   public abstract class BinaryVectorProblem : SingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> {
-    [Storable] public IResultParameter<BinaryVector> BestSolutionParameter { get; private set; }
+    [Storable] protected IResultParameter<ISingleObjectiveSolutionContext<BinaryVector>> BestResultParameter { get; private set; }
+    public IResultDefinition<ISingleObjectiveSolutionContext<BinaryVector>> BestResult { get { return BestResultParameter; } }
 
     public int Length {
@@ -49 +50 @@
     protected BinaryVectorProblem(BinaryVectorProblem original, Cloner cloner)
       : base(original, cloner) {
-      BestSolutionParameter = cloner.Clone(original.BestSolutionParameter);
+      BestResultParameter = cloner.Clone(original.BestResultParameter);
       RegisterEventHandlers();
     }
@@ -56 +57 @@
     protected BinaryVectorProblem(BinaryVectorEncoding encoding) : base(encoding) {
       EncodingParameter.ReadOnly = true;
-      BestSolutionParameter = new ResultParameter<BinaryVector>("Best Solution", "The best solution.");
-      Parameters.Add(BestSolutionParameter);
+      Parameters.Add(BestResultParameter = new ResultParameter<ISingleObjectiveSolutionContext<BinaryVector>>("Best Solution", "The best solution."));
 
       Operators.Add(new HammingSimilarityCalculator());
@@ -67 +67 @@
     }
 
-    public override void Analyze(BinaryVector[] vectors, double[] qualities, ResultCollection results, IRandom random) {
-      base.Analyze(vectors, qualities, results, random);
-      var best = GetBestSolution(vectors, qualities);
-      BestSolutionParameter.ActualValue = (BinaryVector)best.Item1.Clone();
+    public override void Analyze(ISingleObjectiveSolutionContext<BinaryVector>[] solutionContexts, ResultCollection results, IRandom random) {
+      var best = GetBest(solutionContexts);
+      var currentBest = BestResultParameter.ActualValue;
+      if (currentBest == null || IsBetter(best.EvaluationResult.Quality, currentBest.EvaluationResult.Quality))
+        BestResultParameter.ActualValue = (ISingleObjectiveSolutionContext<BinaryVector>)best.Clone();
     }