Changeset 11432

Timestamp:

10/09/14 09:27:42 (10 years ago)

Author:

pfleck

Message:

#2229

• Fixed 2 Bugs in Cordeau parser
  • some solution files contain empty lines
  • depots are not always identified with a zero, but sometimes with their depot number
• Improved error message in VRP unit test

Location:

trunk/sources

Files:

• HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormat/CordeauFormatInstanceProvider.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.VehicleRouting-3.4/VRPInstancesTest.cs (modified) (1 diff)

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

@@ -46 +46 @@
         var toursPerDepotQuery =
           from line in ReadAllLines(reader)
+          where !string.IsNullOrEmpty(line)
           let tokens = line.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries)
           let depot = int.Parse(tokens[0])
@@ -52 +53 @@
           //let load = double.Parse(tokens[3])
           let customers = tokens.Skip(4).Where(t => !t.StartsWith("(")).Select(int.Parse)
+          let numberOfCustomers = customers.Count()
           //let serviceTimes = tokens.Skip(5).Where(t => t.StartsWith("(")).Select(t => int.Parse(t.Trim('(', ')')))
-          let stops = customers.Where(s => s != 0).Select(s => s - 1)
+          let stops = customers.Skip(1).Take(numberOfCustomers - 2).Select(s => s - 1)
           select new { depot, /*vehicle,*/ stops } into assignment
           group assignment by assignment.depot;

trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.VehicleRouting-3.4/VRPInstancesTest.cs

@@ -55 +55 @@
             ((dynamic)vrp).Load(((dynamic)provider).LoadData(instance));
           } catch (Exception exc) {
-            failedInstances.AppendLine(instance + ": " + exc.Message);
+            failedInstances.AppendLine(instance.Name + ": " + exc.Message);
           }
         }