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

Timestamp:

09/15/20 13:53:11 (4 years ago)

Author:

mkommend

Message:

#2971: Added first draft of results implementation and problem adaptation.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/ProbabilisticTSP.cs (modified) (2 diffs)

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

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -77 +76 @@
     }
 
-    public override void Analyze(Permutation[] solutions, double[] qualities, ResultCollection results, IRandom random) {
-      base.Analyze(solutions, qualities, results, random);
-      var max = Maximization;
+    public override void Analyze(ISingleObjectiveSolutionContext<Permutation>[] solutionContexts, IRandom random) {
+      base.Analyze(solutionContexts, random);
 
-      var i = !max ? qualities.Select((x, index) => new { index, Quality = x }).OrderBy(x => x.Quality).First().index
-                   : qualities.Select((x, index) => new { index, Quality = x }).OrderByDescending(x => x.Quality).First().index;
+      //TODO reimplement code below using results directly
 
-      if (double.IsNaN(BestKnownQuality) ||
-          max && qualities[i] > BestKnownQuality ||
-          !max && qualities[i] < BestKnownQuality) {
-        BestKnownQuality = qualities[i];
-        BestKnownSolution = ProbabilisticTSPData.GetSolution((Permutation)solutions[i].Clone(), qualities[i]);
-      }
+      //var max = Maximization;
 
-      IResult bestSolutionResult;
-      if (results.TryGetValue("Best pTSP Solution", out bestSolutionResult)) {
-        var bestSolution = bestSolutionResult.Value as ITSPSolution;
-        if (bestSolution == null || Maximization && bestSolution.TourLength.Value < qualities[i]
-          || !Maximization && bestSolution.TourLength.Value > qualities[i]) {
-          bestSolutionResult.Value = ProbabilisticTSPData.GetSolution(solutions[i], qualities[i]);
-        }
-      } else results.Add(new Result("Best pTSP Solution", ProbabilisticTSPData.GetSolution(solutions[i], qualities[i])));
+      //var i = !max ? qualities.Select((x, index) => new { index, Quality = x }).OrderBy(x => x.Quality).First().index
+      //             : qualities.Select((x, index) => new { index, Quality = x }).OrderByDescending(x => x.Quality).First().index;
+
+      //if (double.IsNaN(BestKnownQuality) ||
+      //    max && qualities[i] > BestKnownQuality ||
+      //    !max && qualities[i] < BestKnownQuality) {
+      //  BestKnownQuality = qualities[i];
+      //  BestKnownSolution = ProbabilisticTSPData.GetSolution((Permutation)solutions[i].Clone(), qualities[i]);
+      //}
+
+      //IResult bestSolutionResult;
+      //if (results.TryGetValue("Best pTSP Solution", out bestSolutionResult)) {
+      //  var bestSolution = bestSolutionResult.Value as ITSPSolution;
+      //  if (bestSolution == null || Maximization && bestSolution.TourLength.Value < qualities[i]
+      //    || !Maximization && bestSolution.TourLength.Value > qualities[i]) {
+      //    bestSolutionResult.Value = ProbabilisticTSPData.GetSolution(solutions[i], qualities[i]);
+      //  }
+      //} else results.Add(new Result("Best pTSP Solution", ProbabilisticTSPData.GetSolution(solutions[i], qualities[i])));
     }