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

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.PermutationEncoding/3.3

Files:

• PermutationMultiObjectiveProblem.cs (modified) (5 diffs)
• PermutationProblem.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationMultiObjectiveProblem.cs

@@ -37 +37 @@
     [Storable] protected ReferenceParameter<IntValue> DimensionRefParameter { get; private set; }
     [Storable] protected ReferenceParameter<EnumValue<PermutationTypes>> PermutationTypeRefParameter { get; private set; }
+    [Storable] public IResult<ParetoFrontScatterPlot<Permutation>> BestParetoFrontResult { get; private set; }
 
     public int Dimension {
@@ -46 +47 @@
       get { return PermutationTypeRefParameter.Value.Value; }
       set { PermutationTypeRefParameter.Value.Value = value; }
+    }
+
+    protected ParetoFrontScatterPlot<Permutation> BestParetoFront {
+      get => BestParetoFrontResult.Value;
+      set => BestParetoFrontResult.Value = value;
     }
 
@@ -59 +65 @@
       DimensionRefParameter = cloner.Clone(original.DimensionRefParameter);
       PermutationTypeRefParameter = cloner.Clone(original.PermutationTypeRefParameter);
+      BestParetoFrontResult = cloner.Clone(original.BestParetoFrontResult);
+
       RegisterEventHandlers();
     }
@@ -68 +76 @@
       Parameters.Add(DimensionRefParameter = new ReferenceParameter<IntValue>("Dimension", "The dimension of the permutation problem.", Encoding.LengthParameter));
       Parameters.Add(PermutationTypeRefParameter = new ReferenceParameter<EnumValue<PermutationTypes>>("Type", "The type of the permutation.", Encoding.PermutationTypeParameter));
+      Results.Add(BestParetoFrontResult = new Result<ParetoFrontScatterPlot<Permutation>>("Best Pareto Front", "The best Pareto front found so far."));
 
       Operators.Add(new HammingSimilarityCalculator());
@@ -81 +90 @@
       var fronts = DominationCalculator.CalculateAllParetoFrontsIndices(individuals, qualities, Maximization);
       var plot = new ParetoFrontScatterPlot<Permutation>(fronts, individuals, qualities, Objectives, BestKnownFront);
-      results.AddOrUpdateResult("Pareto Front Scatter Plot", plot);
+
+      BestParetoFront = plot;
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationProblem.cs

@@ -38 +38 @@
     [Storable] protected ReferenceParameter<IntValue> DimensionRefParameter { get; private set; }
     [Storable] protected ReferenceParameter<EnumValue<PermutationTypes>> PermutationTypeRefParameter { get; private set; }
+    [Storable] public IResult<ISingleObjectiveSolutionContext<Permutation>> BestSolutionResult { get; private set; }
 
     public int Dimension {
@@ -47 +48 @@
       get { return PermutationTypeRefParameter.Value.Value; }
       set { PermutationTypeRefParameter.Value.Value = value; }
+    }
+
+    protected ISingleObjectiveSolutionContext<Permutation> BestSolution {
+      get => BestSolutionResult.Value;
+      set => BestSolutionResult.Value = value;
     }
 
@@ -60 +66 @@
       DimensionRefParameter = cloner.Clone(original.DimensionRefParameter);
       PermutationTypeRefParameter = cloner.Clone(original.PermutationTypeRefParameter);
+      BestSolutionResult = cloner.Clone(original.BestSolutionResult);
       RegisterEventHandlers();
     }
@@ -69 +76 @@
       Parameters.Add(DimensionRefParameter = new ReferenceParameter<IntValue>("Dimension", "The dimension of the permutation problem.", Encoding.LengthParameter));
       Parameters.Add(PermutationTypeRefParameter = new ReferenceParameter<EnumValue<PermutationTypes>>("Type", "The type of the permutation.", Encoding.PermutationTypeParameter));
+      Results.Add(BestSolutionResult = new Result<ISingleObjectiveSolutionContext<Permutation>>("Best Solution", "The best solution found so far."));
 
       Operators.Add(new HammingSimilarityCalculator());
@@ -81 +89 @@
     public override void Analyze(ISingleObjectiveSolutionContext<Permutation>[] solutionContexts, IRandom random) {
       base.Analyze(solutionContexts, random);
-
-      //TODO reimplement code below using results directly                                                                       solutionContexts
-      //var best = GetBestSolution(permutations, qualities);
-      //results.AddOrUpdateResult("Best Solution", (IItem)best.Item1.Clone());
+      var best = GetBest(solutionContexts);
+      if (BestSolution == null || IsBetter(best, BestSolution))
+        BestSolution = best.Clone() as SingleObjectiveSolutionContext<Permutation>;
     }