Changeset 7887

Timestamp:

05/24/12 10:41:05 (12 years ago)

Author:

svonolfe

Message:

Added support for the DCVRP in the Golden format (#1177)

Location:

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/GoldenFormat

Files:

• ChristofidesInstanceProvider.cs (modified) (1 diff)
• GoldenFormatInstanceProvider.cs (modified) (2 diffs)
• GoldenInstanceProvider.cs (modified) (1 diff)
• GoldenParser.cs (modified) (6 diffs)
• KytojokiInstanceProvider.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/GoldenFormat/ChristofidesInstanceProvider.cs

@@ -31 +31 @@
   public class ChristofidesInstanceProvider : GoldenFormatInstanceProvider {
     public override string Name {
-      get { return "Christofides (CVRP)"; }
+      get { return "Christofides (DCVRP)"; }
     }
 

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/GoldenFormat/GoldenFormatInstanceProvider.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
-  public abstract class GoldenFormatInstanceProvider : VRPInstanceProvider<CVRPData> {
-    protected override CVRPData LoadData(Stream stream) {
+  public abstract class GoldenFormatInstanceProvider : VRPInstanceProvider<CVRPTWData> {
+    protected override CVRPTWData LoadData(Stream stream) {
       return LoadInstance(new GoldenParser(stream));
     }
 
-    public override CVRPData LoadData(string path) {
+    public override CVRPTWData LoadData(string path) {
       return LoadInstance(new GoldenParser(path));
     }
 
-    private CVRPData LoadInstance(GoldenParser parser) {
+    private CVRPTWData LoadInstance(GoldenParser parser) {
       parser.Parse();
 
-      var instance = new CVRPData();
+      var instance = new CVRPTWData();
       instance.Dimension = parser.Vertices.GetLength(0) + 1;
       instance.Coordinates = parser.Vertices;
@@ -56 +56 @@
       }
 
+      instance.ReadyTimes = new double[instance.Dimension];
+      instance.ServiceTimes = new double[instance.Dimension];
+      instance.DueTimes = new double[instance.Dimension];
+
+      for (int i = 0; i < instance.Dimension; i++) {
+        instance.ReadyTimes[i] = 0;
+        instance.ServiceTimes[i] = 0;
+        instance.DueTimes[i] = double.MaxValue;
+      }
+
+      if(parser.Distance > 0)
+        instance.DueTimes[0] = parser.Distance;
+
+      if (parser.Vehicles > 0)
+        instance.MaximumVehicles = parser.Vehicles;
+
       instance.Name = parser.ProblemName;
       instance.Description = parser.Comment

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/GoldenFormat/GoldenInstanceProvider.cs

@@ -31 +31 @@
   public class GoldenInstanceProvider : GoldenFormatInstanceProvider {
     public override string Name {
-      get { return "Golden (CVRP)"; }
+      get { return "Golden (DCVRP)"; }
     }
 

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/GoldenFormat/GoldenParser.cs

@@ -48 +48 @@
     private const int NODESECTION = 7;
     private const int CAPACITY = 8;
+    private const int DISTANCE = 12;
     private const int VEHICLES = 13;
     private const int DEPOTSECTION = 9;
@@ -85 +86 @@
       get {
         return vehicles;
+      }
+    }
+
+    private double distance;
+    public double Distance {
+      get {
+        return distance;
       }
     }
@@ -113 +121 @@
       capacity = -1;
       vehicles = -1;
+      distance = -1;
       demands = null;
     }
@@ -179 +188 @@
               case VEHICLES:
                 ReadVehicles(str);
+                break;
+              case DISTANCE:
+                ReadDistance(str);
                 break;
               case DEPOTSECTION:
@@ -226 +238 @@
       if (token.Equals("vehicles", StringComparison.OrdinalIgnoreCase))
         return VEHICLES;
+      if (token.Equals("distance", StringComparison.OrdinalIgnoreCase))
+        return DISTANCE;
       if (token.Equals("depot_section", StringComparison.OrdinalIgnoreCase))
         return DEPOTSECTION;
@@ -321 +335 @@
     }
 
+    private void ReadDistance(string str) {
+      string[] tokens = str.Split(new string[] { ":" }, StringSplitOptions.None);
+      distance = double.Parse(tokens[tokens.Length - 1].Trim(), System.Globalization.CultureInfo.InvariantCulture);
+    }
+
     private void ReadDepot(StreamReader reader) {
       string[] tokens;

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/GoldenFormat/KytojokiInstanceProvider.cs

@@ -31 +31 @@
   public class KytojokiInstanceProvider : GoldenFormatInstanceProvider {
     public override string Name {
-      get { return "Kytojoki (CVRP)"; }
+      get { return "Kytojoki (DCVRP)"; }
     }