Changeset 17526 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering

Timestamp:

05/08/20 06:34:12 (4 years ago)

Author:

abeham

Message:

#2521: Completed porting of OrienteeringProblem

• Adapted unit tests
• Commented non-working unit test

Location:

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

Files:

• DistanceMatrix.cs (deleted)
• HeuristicLab.Problems.Orienteering-3.3.csproj (modified) (1 diff)
• OrienteeringProblem.cs (modified) (1 diff)
• OrienteeringSolution.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/HeuristicLab.Problems.Orienteering-3.3.csproj

@@ -90 +90 @@
   <ItemGroup>
     <Compile Include="Creators\GreedyOrienteeringTourCreator.cs" />
-    <Compile Include="DistanceMatrix.cs" />
     <Compile Include="Improvers\OrienteeringLocalImprovementOperator.cs" />
     <Compile Include="Interfaces\IOrienteeringSolutionCreator.cs" />

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

@@ -110 +110 @@
       var data = OrienteeringProblemData;
 
-      var best = GetBestSolution(vectors, qualities);
-      var score = CalculateScore(OrienteeringProblemData, best.Item1);
-      var travelCosts = CalculateTravelCosts(OrienteeringProblemData, best.Item1);
+      var best = GetBestSolution(vectors, qualities).Item1;
+      var score = CalculateScore(OrienteeringProblemData, best);
+      var travelCosts = CalculateTravelCosts(OrienteeringProblemData, best);
       var quality = CalculateQuality(OrienteeringProblemData, score, travelCosts);
 
-      if (BestKnownQuality == double.NaN || best.Item2 > BestKnownQuality) {
-        BestKnownQuality = best.Item2;
-        BestKnownSolutionParameter.ActualValue = data.GetSolution((IntegerVector)best.Item1.Clone(), quality, 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) {
-        bestSoFar = data.GetSolution((IntegerVector)best.Item1.Clone(), quality, score, travelCosts);
+      if (bestSoFar == null || IsBetter(quality, bestSoFar.Quality.Value)) {
+        bestSoFar = data.GetSolution((IntegerVector)best.Clone(), quality, score, travelCosts);
         BestOrienteeringSolutionParameter.ActualValue = bestSoFar;
-      } else {
-        if (IsBetter(best.Item2, bestSoFar.Quality.Value)) {
-          bestSoFar.Route = (IntegerVector)best.Item1.Clone();
-          bestSoFar.Quality.Value = quality;
-          bestSoFar.Score.Value = score;
-          bestSoFar.TravelCosts.Value = travelCosts;
-        }
       }
     }

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

@@ -101 +101 @@
       : base(original, cloner) {
       this.route = cloner.Clone(original.route);
+      this.routeAsPermutation = cloner.Clone(original.routeAsPermutation);
       this.opData = cloner.Clone(original.opData);
       this.quality = cloner.Clone(original.quality);
@@ -110 +111 @@
       : base() {
       this.route = route;
+      this.routeAsPermutation = new Permutation(PermutationTypes.RelativeDirected, route);
       this.opData = opData;
       this.quality = quality;