Changeset 17382 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs

Timestamp:

12/18/19 16:11:21 (5 years ago)

Author:

mkommend

Message:

#2521: Refactored single-objective problems to use EvaluationResult instead of double as return type from Evaluate.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs

@@ -29 +29 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Problems.Instances;
@@ -56 +57 @@
       set { RealizationsParameter.Value.Value = value; }
     }
-    
+
     private ReadOnlyItemList<BoolArray> RealizationData {
       get { return RealizationDataParameter.Value; }
@@ -102 +103 @@
     }
 
-    public override double Evaluate(Permutation tour, IRandom random, CancellationToken cancellationToken) {
-      return Evaluate(tour, ProbabilisticTSPData, RealizationData, cancellationToken);
+    public override ISingleObjectiveEvaluationResult Evaluate(Permutation tour, IRandom random, CancellationToken cancellationToken) {
+      var quality = Evaluate(tour, ProbabilisticTSPData, RealizationData, cancellationToken);
+      return new SingleObjectiveEvaluationResult(quality);
     }