Changeset 17745 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/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.Orienteering/3.3/OrienteeringProblem.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs

@@ -121 +121 @@
     }
 
-    public override void Analyze(IntegerVector[] vectors, double[] qualities, ResultCollection results, IRandom random) {
-      base.Analyze(vectors, qualities, results, random);
-      var data = OrienteeringProblemData;
-
-      var best = GetBestSolution(vectors, qualities).Item1;
-      var score = CalculateScore(OrienteeringProblemData, best);
-      var travelCosts = CalculateTravelCosts(OrienteeringProblemData, best);
-      var quality = CalculateQuality(OrienteeringProblemData, score, travelCosts);
-
-      if (double.IsNaN(BestKnownQuality) || IsBetter(quality, BestKnownQuality)) {
-        BestKnownQuality = quality;
-        BestKnownSolutionParameter.ActualValue = data.GetSolution((IntegerVector)best.Clone(), quality, score, travelCosts);
-      }
-      var bestSoFar = BestOrienteeringSolutionParameter.ActualValue;
-
-      if (bestSoFar == null || IsBetter(quality, bestSoFar.Quality.Value)) {
-        bestSoFar = data.GetSolution((IntegerVector)best.Clone(), quality, score, travelCosts);
-        BestOrienteeringSolutionParameter.ActualValue = bestSoFar;
-      }
+    public override void Analyze(ISingleObjectiveSolutionContext<IntegerVector>[] solutionContexts, IRandom random) {
+      base.Analyze(solutionContexts, random);
+
+      //TODO reimplement code below using results directly
+
+      //var data = OrienteeringProblemData;
+
+      //var best = GetBestSolution(vectors, qualities).Item1;
+      //var score = CalculateScore(OrienteeringProblemData, best);
+      //var travelCosts = CalculateTravelCosts(OrienteeringProblemData, best);
+      //var quality = CalculateQuality(OrienteeringProblemData, score, travelCosts);
+
+      //if (double.IsNaN(BestKnownQuality) || IsBetter(quality, BestKnownQuality)) {
+      //  BestKnownQuality = quality;
+      //  BestKnownSolutionParameter.ActualValue = data.GetSolution((IntegerVector)best.Clone(), quality, score, travelCosts);
+      //}
+      //var bestSoFar = BestOrienteeringSolutionParameter.ActualValue;
+
+      //if (bestSoFar == null || IsBetter(quality, bestSoFar.Quality.Value)) {
+      //  bestSoFar = data.GetSolution((IntegerVector)best.Clone(), quality, score, travelCosts);
+      //  BestOrienteeringSolutionParameter.ActualValue = bestSoFar;
+      //}
     }
     public static double CalculateInsertionCosts(IOrienteeringProblemData data, IList<int> path, int insertPosition, int point) {
@@ -173 +176 @@
       if (Dimension != OrienteeringProblemData.Cities) {
         Dimension = OrienteeringProblemData.Cities;
-        Bounds = new Data.IntMatrix(new [,] { { 0, Dimension } }, @readonly: true);
+        Bounds = new Data.IntMatrix(new[,] { { 0, Dimension } }, @readonly: true);
       }
     }