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

Timestamp:

05/08/20 16:55:51 (5 years ago)

Author:

abeham

Message:

#2521: Unified architecture

Location:

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

Files:

• Creators/GreedyOrienteeringTourCreator.cs (modified) (2 diffs)
• Improvers/OrienteeringLocalImprovementOperator.cs (modified) (2 diffs)
• OrienteeringProblem.cs (modified) (2 diffs)
• OrienteeringProblemdata.cs (modified) (5 diffs)
• OrienteeringSolution.cs (modified) (6 diffs)
• Shakers/OrienteeringShakingOperator.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Creators/GreedyOrienteeringTourCreator.cs

@@ -66 +66 @@
       // Find all points within the maximum distance allowed (ellipse)
       var feasiblePoints = (
-        from point in Enumerable.Range(0, data.RoutingData.Cities)
-        let travelCosts = data.RoutingData.GetDistance(data.StartingPoint, point)
-        + data.RoutingData.GetDistance(point, data.TerminalPoint) + data.PointVisitingCosts
+        from point in Enumerable.Range(0, data.Cities)
+        let travelCosts = data.GetDistance(data.StartingPoint, point)
+        + data.GetDistance(point, data.TerminalPoint) + data.PointVisitingCosts
         let score = data.GetScore(point)
         where travelCosts <= data.MaximumTravelCosts
@@ -81 +81 @@
         data.TerminalPoint
       };
-      double tourLength = data.RoutingData.GetDistance(data.StartingPoint, data.TerminalPoint);
+      double tourLength = data.GetDistance(data.StartingPoint, data.TerminalPoint);
 
       // Add points in a greedy way

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.cs

@@ -126 +126 @@
 
         // Determine all points that have not yet been visited by this tour
-        var visitablePoints = Enumerable.Range(0, data.RoutingData.Cities).Except(tour).ToList();
+        var visitablePoints = Enumerable.Range(0, data.Cities).Except(tour).ToList();
 
         // Determine if any of the visitable points can be included at any position within the tour
@@ -168 +168 @@
             double newLength = tourLength;
             // Recalculate length of whole swapped part, in case distances are not symmetric
-            for (int index = position - 1; index < position + blockLength; index++) newLength -= data.RoutingData.GetDistance(tour[index], tour[index + 1]);
-            for (int index = position + blockLength - 1; index > position; index--) newLength += data.RoutingData.GetDistance(tour[index], tour[index - 1]);
-            newLength += data.RoutingData.GetDistance(tour[position - 1], tour[position + blockLength - 1]);
-            newLength += data.RoutingData.GetDistance(tour[position], tour[position + blockLength]);
+            for (int index = position - 1; index < position + blockLength; index++) newLength -= data.GetDistance(tour[index], tour[index + 1]);
+            for (int index = position + blockLength - 1; index > position; index--) newLength += data.GetDistance(tour[index], tour[index - 1]);
+            newLength += data.GetDistance(tour[position - 1], tour[position + blockLength - 1]);
+            newLength += data.GetDistance(tour[position], tour[position + blockLength]);
 
             if (newLength < tourLength - 0.00001) {

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

@@ -96 +96 @@
     }
     public static double CalculateTravelCosts(IOrienteeringProblemData data, IntegerVector solution) {
-      var distance = data.RoutingData.GetPathDistance(solution, closed: false);
+      var distance = data.GetPathDistance(solution, closed: false);
       distance += (solution.Length - 2) * data.PointVisitingCosts;
       return distance;
     }
     public static double CalculateTravelCosts(IOrienteeringProblemData data, IList<int> solution) {
-      var distance = data.RoutingData.GetPathDistance(solution, closed: false);
+      var distance = data.GetPathDistance(solution, closed: false);
       distance += (solution.Count - 2) * data.PointVisitingCosts;
       return distance;
@@ -127 +127 @@
     }
     public static double CalculateInsertionCosts(IOrienteeringProblemData data, IList<int> path, int insertPosition, int point) {
-      double detour = data.RoutingData.GetDistance(path[insertPosition - 1], point) + data.RoutingData.GetDistance(point, path[insertPosition]);
+      double detour = data.GetDistance(path[insertPosition - 1], point) + data.GetDistance(point, path[insertPosition]);
       detour += data.PointVisitingCosts;
-      detour -= data.RoutingData.GetDistance(path[insertPosition - 1], path[insertPosition]);
+      detour -= data.GetDistance(path[insertPosition - 1], path[insertPosition]);
       return detour;
     }
     public static double CalculateReplacementCosts(IOrienteeringProblemData data, IList<int> path, int replacePosition, int point) {
-      double detour = data.RoutingData.GetDistance(path[replacePosition - 1], point) + data.RoutingData.GetDistance(point, path[replacePosition + 1]);
-      detour -= data.RoutingData.GetDistance(path[replacePosition - 1], path[replacePosition]) + data.RoutingData.GetDistance(path[replacePosition], path[replacePosition + 1]);
+      double detour = data.GetDistance(path[replacePosition - 1], point) + data.GetDistance(point, path[replacePosition + 1]);
+      detour -= data.GetDistance(path[replacePosition - 1], path[replacePosition]) + data.GetDistance(path[replacePosition], path[replacePosition + 1]);
       return detour;
     }
     public static double CalculateRemovementSaving(IOrienteeringProblemData data, IList<int> path, int removePosition) {
-      double saving = data.RoutingData.GetDistance(path[removePosition - 1], path[removePosition]);
-      saving += data.RoutingData.GetDistance(path[removePosition], path[removePosition + 1]);
-      saving -= data.RoutingData.GetDistance(path[removePosition - 1], path[removePosition + 1]);
+      double saving = data.GetDistance(path[removePosition - 1], path[removePosition]);
+      saving += data.GetDistance(path[removePosition], path[removePosition + 1]);
+      saving -= data.GetDistance(path[removePosition - 1], path[removePosition + 1]);
       saving += data.PointVisitingCosts;
       return saving;

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

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -5 +6 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
+using HeuristicLab.Encodings.PermutationEncoding;
+using HeuristicLab.Problems.Instances;
 using HeuristicLab.Problems.Instances.Types;
 using HeuristicLab.Problems.TravelingSalesman;
@@ -10 +13 @@
 namespace HeuristicLab.Problems.Orienteering {
   [StorableType("c33063a6-a2ee-4054-9dd8-46a738003139")]
-  public interface IOrienteeringProblemData : INamedItem {
-    ITSPData RoutingData { get; }
+  public interface IOrienteeringProblemData : ITSPData {
     int StartingPoint { get; }
     int TerminalPoint { get; }
@@ -19 +21 @@
     double GetScore(int city);
     OrienteeringSolution GetSolution(IntegerVector route, double quality, double score, double travelCosts);
-    OPData Export();
+    new OPData Export();
   }
 
@@ -93 +95 @@
     }
 
+    #region ITSPData members
+    int ITSPData.Cities => RoutingData.Cities;
+    double ITSPData.GetDistance(int fromCity, int toCity) => RoutingData.GetDistance(fromCity, toCity);
+    double ITSPData.GetPathDistance(IEnumerable<int> path, bool closed) => RoutingData.GetPathDistance(path, closed);
+    ITSPSolution ITSPData.GetSolution(Permutation tspTour, double tourLength) => RoutingData.GetSolution(tspTour, tourLength);
+    TSPData ITSPData.Export() => RoutingData.Export();
+    DoubleMatrix ITSPData.GetCoordinatesOrDefault() => RoutingData.GetCoordinatesOrDefault();
+    #endregion
+
     private static double[,] defaultCoordinates = new double[21, 2] {
       {  4.60,  7.10 }, {  5.70, 11.40 }, {  4.40, 12.30 }, {  2.80, 14.30 }, {  3.20, 10.30 },

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

@@ -31 +31 @@
 
 namespace HeuristicLab.Problems.Orienteering {
+  public interface IOrienteeringSolution : ITSPSolution {
+    new IOrienteeringProblemData Data { get; }
+    new IntegerVector Tour { get; }
+    DoubleValue Quality { get; }
+    DoubleValue Score { get; }
+    DoubleValue TravelCosts { get; }
+  }
+
   [Item("OrienteeringSolution", "Represents a Orienteering solution which can be visualized in the GUI.")]
   [StorableType("BC58ED08-B9A7-40F3-B8E0-A6B33AA993F4")]
-  public sealed class OrienteeringSolution : Item, ITSPSolution {
+  public sealed class OrienteeringSolution : Item, IOrienteeringSolution {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Image; }
@@ -40 +48 @@
     [Storable] private Permutation routeAsPermutation;
     [Storable] private IntegerVector route;
-    public IntegerVector Route {
+    public IntegerVector Tour {
       get { return route; }
       set {
@@ -46 +54 @@
         route = value;
         routeAsPermutation = new Permutation(PermutationTypes.RelativeDirected, value);
-        OnPropertyChanged(nameof(Route));
-        OnPropertyChanged(nameof(ITSPSolution.Tour));
+        OnPropertyChanged(nameof(Tour));
       }
     }
-    [Storable] private IOrienteeringProblemData opData;
-    public IOrienteeringProblemData OPData {
-      get { return opData; }
+    [Storable] private IOrienteeringProblemData data;
+    public IOrienteeringProblemData Data {
+      get { return data; }
       set {
-        if (opData == value) return;
-        opData = value;
-        OnPropertyChanged(nameof(OPData));
-        OnPropertyChanged(nameof(ITSPSolution.TSPData));
+        if (data == value) return;
+        data = value;
+        OnPropertyChanged(nameof(Data));
       }
     }
@@ -92 +98 @@
     }
 
-    ITSPData ITSPSolution.TSPData => OPData.RoutingData;
+    ITSPData ITSPSolution.Data => Data;
     Permutation ITSPSolution.Tour => routeAsPermutation;
     DoubleValue ITSPSolution.TourLength => TravelCosts;
@@ -102 +108 @@
       this.route = cloner.Clone(original.route);
       this.routeAsPermutation = cloner.Clone(original.routeAsPermutation);
-      this.opData = cloner.Clone(original.opData);
+      this.data = cloner.Clone(original.data);
       this.quality = cloner.Clone(original.quality);
       this.score = cloner.Clone(original.score);
@@ -112 +118 @@
       this.route = route;
       this.routeAsPermutation = new Permutation(PermutationTypes.RelativeDirected, route);
-      this.opData = opData;
+      this.data = opData;
       this.quality = quality;
       this.score = score;

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.cs

@@ -96 +96 @@
       var initialTour = IntegerVectorParameter.ActualValue;
       var data = OrienteeringProblemDataParameter.ActualValue;
-      int numPoints = data.RoutingData.Cities;
+      int numPoints = data.Cities;
 
       if (NeighborhoodCountParameter.ActualValue == null)
@@ -117 +117 @@
           from point in Enumerable.Range(0, numPoints)
           // Calculate the distance when going from the starting point to this point and then to the end point
-          let distance = data.RoutingData.GetDistance(data.StartingPoint, point) + data.RoutingData.GetDistance(point, data.TerminalPoint) + data.PointVisitingCosts
+          let distance = data.GetDistance(data.StartingPoint, point) + data.GetDistance(point, data.TerminalPoint) + data.PointVisitingCosts
           // If this distance is feasible and the point is neither starting nor ending point, check the point
           where distance < data.MaximumTravelCosts && point != data.StartingPoint && point != data.TerminalPoint