Changeset 11292 for trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormat

Timestamp:

08/20/14 12:12:40 (10 years ago)

Author:

pfleck

Message:

#2226
Split the CordeauInstanceProvider into 2 InstanceProvider which separates the MDCVRP and MDCVRPTW instances.

Location:

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormat

Files:

• CordeauFormatInstanceProvider.cs (modified) (2 diffs)
• CordeauInstanceProvider.cs (modified) (3 diffs)
• CordeauTWInstanceProvider.cs (added)

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormat/CordeauFormatInstanceProvider.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
-  public abstract class CordeauFormatInstanceProvider : VRPInstanceProvider<MDCVRPTWData> {
-    protected override MDCVRPTWData LoadData(Stream stream) {
+  public abstract class CordeauFormatInstanceProvider<T> : VRPInstanceProvider<T> where T : MDCVRPData {
+    protected override T LoadData(Stream stream) {
       return LoadInstance(new CordeauParser(stream));
     }
@@ -31 +31 @@
       get { return true; }
     }
-    public override MDCVRPTWData ImportData(string path) {
+    public override T ImportData(string path) {
       return LoadInstance(new CordeauParser(path));
     }
 
-    private MDCVRPTWData LoadInstance(CordeauParser parser) {
-      parser.Parse();
-
-      var instance = new MDCVRPTWData();
-      instance.Dimension = parser.Cities + 1;
-      instance.Depots = parser.Depots;
-      instance.Coordinates = parser.Coordinates;
-      instance.Capacity = parser.Capacity;
-      instance.Demands = parser.Demands;
-      instance.DistanceMeasure = DistanceMeasure.Euclidean;
-      instance.ReadyTimes = parser.Readytimes;
-      instance.ServiceTimes = parser.Servicetimes;
-      instance.DueTimes = parser.Duetimes;
-      instance.MaximumVehicles = parser.Vehicles;
-
-      int depots = parser.Depots;
-      int vehicles = parser.Vehicles / parser.Depots;
-      instance.VehicleDepotAssignment = new int[depots * vehicles];
-      int index = 0;
-
-      for (int i = 0; i < depots; i++)
-        for (int j = 0; j < vehicles; j++) {
-          instance.VehicleDepotAssignment[index] = i;
-          index++;
-        }
-
-      instance.Name = parser.ProblemName;
-
-      return instance;
-    }
+    internal abstract T LoadInstance(CordeauParser parser);
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormat/CordeauInstanceProvider.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using ICSharpCode.SharpZipLib.Zip;
 
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
-  public class CordeauInstanceProvider : CordeauFormatInstanceProvider {
+  public class CordeauInstanceProvider : CordeauFormatInstanceProvider<MDCVRPData> {
     public override string Name {
-      get { return "Cordeau (MDCVRPTW)"; }
+      get { return "Cordeau (MDCVRP)"; }
     }
 
@@ -39 +33 @@
 
     public override Uri WebLink {
-      get { return new Uri(@"http://neo.lcc.uma.es/vrp/vrp-instances/"); }
+      get { return new Uri(@"http://neo.lcc.uma.es/vrp/vrp-instances/multiple-depot-vrp-instances/"); }
     }
 
     public override string ReferencePublication {
-      get { return @"J.-F. Cordeau, M. Gendreau, G. Laporte. 1997.
+      get {
+        return @"J.-F. Cordeau, M. Gendreau, G. Laporte. 1997.
 A tabu search heuristic for periodic and multi-depot vehicle routing problems.
-Networks, 30, pp. 105–119."; }
+Networks, 30, pp. 105–119.";
+      }
     }
 
@@ -51 +47 @@
       get { return "Cordeau"; }
     }
+
+    internal override MDCVRPData LoadInstance(CordeauParser parser) {
+      parser.Parse();
+
+      var instance = new MDCVRPData();
+      instance.Dimension = parser.Cities + 1;
+      instance.Depots = parser.Depots;
+      instance.Coordinates = parser.Coordinates;
+      instance.Capacity = parser.Capacity;
+      instance.Demands = parser.Demands;
+      instance.DistanceMeasure = DistanceMeasure.Euclidean;
+      instance.MaximumVehicles = parser.Vehicles;
+
+      int depots = parser.Depots;
+      int vehicles = parser.Vehicles / parser.Depots;
+      instance.VehicleDepotAssignment = new int[depots * vehicles];
+      int index = 0;
+
+      for (int i = 0; i < depots; i++)
+        for (int j = 0; j < vehicles; j++) {
+          instance.VehicleDepotAssignment[index] = i;
+          index++;
+        }
+
+      instance.Name = parser.ProblemName;
+
+      return instance;
+    }
   }
 }