Changeset 7891 for branches/VRP

Timestamp:

05/24/12 11:12:39 (13 years ago)

Author:

svonolfe

Message:

Fixed issues in Cordeau parser (#1177)

File:

• branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormat/CordeauParser.cs (modified) (4 diffs)

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormat/CordeauParser.cs

@@ -160 +160 @@
          bool timeWindows = type == 6;
          vehicles = int.Parse(m[1].Value);
+         cities = int.Parse(m[2].Value);
          depots = int.Parse(m[3].Value);
          line = reader.ReadLine();
@@ -176 +177 @@
            m = reg.Matches(line);
 
-           if (m.Count >= 11) {
+           if (demand.Count < cities) {
              xCoord.Add(double.Parse(m[1].Value, System.Globalization.CultureInfo.InvariantCulture));
              yCoord.Add(double.Parse(m[2].Value, System.Globalization.CultureInfo.InvariantCulture));
@@ -189 +190 @@
                dueTime.Add(double.MaxValue);
              }
-           } else if (m.Count >= 7) {
+           } else {
              depotXcoord.Add(double.Parse(m[1].Value, System.Globalization.CultureInfo.InvariantCulture));
              depotYcoord.Add(double.Parse(m[2].Value, System.Globalization.CultureInfo.InvariantCulture));
@@ -218 +219 @@
          dueTime.InsertRange(0, depotDueTime);
 
-         cities = demand.Count;
-         depots = depotXcoord.Count;
-
          List<double> originalCapacities = new List<double>(capacity);
          capacity.Clear();
-         for (int i = 0; i < vehicles; i++) {
-           for (int j = 0; j < depots; j++) {
+         for (int i = 0; i < depots; i++) {
+           for (int j = 0; j < vehicles; j++) {
              capacity.Add(originalCapacities[i]);
            }