Changeset 8839

Timestamp:

10/23/12 13:27:08 (12 years ago)

Author:

svonolfe

Message:

Adapted the parser to read the distance matrix (#1955)

Location:

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3

Files:

• Parsers/DynPDPParser.cs (modified) (2 diffs)
• Parsers/TSPLibDynPDPParser.cs (modified) (4 diffs)
• PickupDeliveryScenario.cs (modified) (1 diff)

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/Parsers/DynPDPParser.cs

@@ -50 +50 @@
     }
 
+    public struct DistanceMatrixInformation {
+      public bool useDistanceMatrix;
+      public int[,] coordinates;
+      public double[,] matrix;
+    }
+
     protected string file;
     protected string problemName;
     protected List<Vehicle> vehicles;
     protected List<Order> orders;
+    protected DistanceMatrixInformation distanceMatrix;
 
     public string ProblemName {
@@ -73 +80 @@
     }
 
+    public DistanceMatrixInformation DistanceMatrix {
+      get {
+        return distanceMatrix;
+      } 
+    }
+
     public DynPDPParser(string file) {
       this.file = file;
       vehicles = new List<Vehicle>();
       orders = new List<Order>();
+      distanceMatrix = new DistanceMatrixInformation();
+      distanceMatrix.useDistanceMatrix = false;
+      distanceMatrix.coordinates = null;
+      distanceMatrix.matrix = null;
     }
 

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/Parsers/TSPLibDynPDPParser.cs

@@ -23 +23 @@
 using System.IO;
 using System.Text.RegularExpressions;
+using System;
 
 namespace HeuristicLab.PDPSimulation {
@@ -52 +53 @@
         int dueTime = int.Parse(dueTimeLine);
 
-        List<double> xCoord = new List<double>();
-        List<double> yCoord = new List<double>();
+        List<int> xCoord = new List<int>();
+        List<int> yCoord = new List<int>();
 
         line = reader.ReadLine();
@@ -59 +60 @@
         m = reg.Matches(line);
         while (m.Count == 3) {
-          xCoord.Add(double.Parse(m[1].Value, System.Globalization.CultureInfo.InvariantCulture));
-          yCoord.Add(double.Parse(m[2].Value, System.Globalization.CultureInfo.InvariantCulture));
+          xCoord.Add(int.Parse(m[1].Value, System.Globalization.CultureInfo.InvariantCulture));
+          yCoord.Add(int.Parse(m[2].Value, System.Globalization.CultureInfo.InvariantCulture));
 
           line = reader.ReadLine();
@@ -76 +77 @@
 
           vehicles.Add(v);
+        }
+
+        if (line.Contains("EDGE_WEIGHT_TYPE: EXPLICIT")) {
+          line = reader.ReadLine();
+
+          int count = xCoord.Count;
+
+          distanceMatrix.useDistanceMatrix = true;
+          distanceMatrix.coordinates = new int[count, 2];
+          for (int i = 0; i < count; i++) {
+            distanceMatrix.coordinates[i, 0] = xCoord[i];
+            distanceMatrix.coordinates[i, 1] = yCoord[i];
+          }
+
+          distanceMatrix.matrix = new double[count, count];
+
+          line = reader.ReadLine();
+          m = reg.Matches(line);
+
+          int j = 0;
+          while (m.Count == count) {
+            for (int i = 0; i < count; i++) {
+              distanceMatrix.matrix[i, j] = double.Parse(m[i].Value, System.Globalization.CultureInfo.InvariantCulture);              
+            }
+
+            line = reader.ReadLine();
+            m = reg.Matches(line);
+            j++;
+          }
+
+          if (j != count)
+            throw new Exception("Invalid distance matrix definition");
         }
 

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/PickupDeliveryScenario.cs

@@ -212 +212 @@
       VehicleDueTimesParameter.Value = vehicleDueTimes;
 
+      if (parser.DistanceMatrix.useDistanceMatrix) {
+        DistanceMatrixMeasure dm = new DistanceMatrixMeasure();
+
+        dm.PointMapping = new IntMatrix(parser.DistanceMatrix.coordinates);
+        dm.DistanceMatrix = new DoubleMatrix(parser.DistanceMatrix.matrix);
+
+        DistanceMeasure = dm;
+      }
+
       PickupDeliveryPredefinedOrderGenerator orderGen = new PickupDeliveryPredefinedOrderGenerator();
       int orders = parser.Orders.Length;