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

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.

Location:

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

Files:

• AnalyticalPTSP.cs (modified) (2 diffs)
• EstimatedPTSP.cs (modified) (3 diffs)
• ProbabilisticTSP.cs (modified) (1 diff)

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

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.PermutationEncoding;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.PTSP {
@@ -60 +61 @@
     }
 
-    public override double Evaluate(Permutation tour, IRandom random, CancellationToken cancellationToken) {
-      return Evaluate(tour, ProbabilisticTSPData, cancellationToken);
+    public override ISingleObjectiveEvaluationResult Evaluate(Permutation tour, IRandom random, CancellationToken cancellationToken) {
+      var quality = Evaluate(tour, ProbabilisticTSPData, cancellationToken);
+      return new SingleObjectiveEvaluationResult(quality);
     }
 

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);
     }
 

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

@@ -124 +124 @@
         try {
           var tour = new Permutation(PermutationTypes.RelativeUndirected, data.BestKnownTour);
-          var tourLength = Evaluate(tour, new MersenneTwister(1));
+          var tourLength = Evaluate(tour, new MersenneTwister(1)).Quality;
           BestKnownSolution = ProbabilisticTSPData.GetSolution(tour, tourLength);
           BestKnownQuality = tourLength;