Changeset 17529 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances

Timestamp:

05/08/20 11:21:57 (5 years ago)

Author:

abeham

Message:

#2521: some fixes and reusing handling of distance measure as defined in TSP

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances/3.3/Types/VRP/VRPData.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances/3.3/Types/VRP/VRPData.cs

@@ -25 +25 @@
   /// Describes instances of the Vehicle Routing Problem (VRP).
   /// </summary>
-  public class VRPData : IVRPData {
-    /// <summary>
-    /// The name of the instance
-    /// </summary>
-    public string Name { get; set; }
-    /// <summary>
-    /// Optional! The description of the instance
-    /// </summary>
-    public string Description { get; set; }
-
-    /// <summary>
-    /// The number of customers and the depot
-    /// </summary>
-    public int Dimension { get; set; }
-    /// <summary>
-    /// The distance measure that is used to calculate the distance between
-    ///the coordinates if no <see cref="Distances"/> is given.
-    /// </summary>
-    public DistanceMeasure DistanceMeasure { get; set; }
+  public class VRPData : TSPData, IVRPData {
     /// <summary>
     /// Optional! The maximum number of vehicles that can be used.
@@ -53 +35 @@
     /// </remarks>
     public double? MaximumVehicles { get; set; }
-    /// <remarks>
-    /// Either Distances or the <see cref="Coordinates"/> need to be specified along
-    /// with a distance measure.
-    /// </remarks>
-    public double[,] Distances { get; set; }
-    /// <summary>
-    /// Optional! A a matrix of dimension [N, 2] where each row is either the customer
-    /// or the depot and the columns represent x and y coordinates respectively.
-    /// </summary>
-    /// <remarks>
-    /// Either <see cref="Distances"/> or the Coordinates need to be specified along
-    /// with a distance measure.
-    /// </remarks>
-    public double[,] Coordinates { get; set; }
     /// <summary>
     /// The demand vector that specifies how many goods need to be delivered.
@@ -76 +44 @@
     /// Optional! The best-known solution as a list of tours in path-encoding.
     /// </summary>
-    public int[][] BestKnownTour { get; set; }
+    public new int[][] BestKnownTour { get; set; }
     /// <summary>
     /// Optional! Specifies the used vehicle for a given tour.
     /// </summary>
     public int[] BestKnownTourVehicleAssignment { get; set; }
-    /// <summary>
-    /// Optional! The quality of the best-known solution.
-    /// </summary>
-    public double? BestKnownQuality { get; set; }
-
-    /// <summary>
-    /// If only the coordinates are given, can calculate the distance matrix.
-    /// </summary>
-    /// <returns>A full distance matrix between all cities.</returns>
-    public double[,] GetDistanceMatrix() {
-      return DistanceHelper.GetDistanceMatrix(DistanceMeasure, Coordinates, Distances, Dimension);
-    }
   }
 }