Changeset 17745 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/TSP.cs

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.TravelingSalesman/3.3/TSP.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/TSP.cs

@@ -99 +99 @@
     }
 
-    public override void Analyze(Permutation[] solutions, double[] qualities, ResultCollection results, IRandom random) {
-      base.Analyze(solutions, qualities, results, random);
-      int i = -1;
-      if (!Maximization)
-        i = qualities.Select((x, index) => new { index, Fitness = x }).OrderBy(x => x.Fitness).First().index;
-      else i = qualities.Select((x, index) => new { index, Fitness = x }).OrderByDescending(x => x.Fitness).First().index;
-
-      if (double.IsNaN(BestKnownQuality) ||
-          Maximization && qualities[i] > BestKnownQuality ||
-          !Maximization && qualities[i] < BestKnownQuality) {
-        var bestKnown = TSPData.GetSolution(solutions[i], qualities[i]);
-        BestKnownQualityParameter.Value = new DoubleValue(qualities[i]);
-        BestKnownSolutionParameter.Value = bestKnown;
-      }
-
-      var bestSolution = BestTSPSolutionParameter.ActualValue;
-      if (bestSolution == null || IsBetter(qualities[i], bestSolution.TourLength.Value)) {
-        BestTSPSolutionParameter.ActualValue = TSPData.GetSolution(solutions[i], qualities[i]);
-      }
+    public override void Analyze(ISingleObjectiveSolutionContext<Permutation>[] solutionContexts, IRandom random) {
+      base.Analyze(solutionContexts, random);
+
+      //TODO reimplement code below using results directly
+      //int i = -1;
+      //if (!Maximization)
+      //  i = qualities.Select((x, index) => new { index, Fitness = x }).OrderBy(x => x.Fitness).First().index;
+      //else i = qualities.Select((x, index) => new { index, Fitness = x }).OrderByDescending(x => x.Fitness).First().index;
+
+      //if (double.IsNaN(BestKnownQuality) ||
+      //    Maximization && qualities[i] > BestKnownQuality ||
+      //    !Maximization && qualities[i] < BestKnownQuality) {
+      //  var bestKnown = TSPData.GetSolution(solutions[i], qualities[i]);
+      //  BestKnownQualityParameter.Value = new DoubleValue(qualities[i]);
+      //  BestKnownSolutionParameter.Value = bestKnown;
+      //}
+
+      //var bestSolution = BestTSPSolutionParameter.ActualValue;
+      //if (bestSolution == null || IsBetter(qualities[i], bestSolution.TourLength.Value)) {
+      //  BestTSPSolutionParameter.ActualValue = TSPData.GetSolution(solutions[i], qualities[i]);
+      //}
     }