Changeset 11478

Timestamp:

10/17/14 11:43:40 (10 years ago)

Author:

pfleck

Message:

#2229:

• Added fall-back for solution parsing to try the own .opt-Format.
• Parsing uses InvariantCulture instead of a specific one.
• Small refactoring.

Location:

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

Files:

• CordeauFormat/CordeauFormatInstanceProvider.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances.VehicleRouting-3.4.csproj (modified) (1 diff)
• SolomonFormat/SolomonFormatInstanceProvider.cs (modified) (2 diffs)
• StreamReaderHelper.cs (added)
• VRPInstanceProvider.cs (modified) (2 diffs)

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

@@ -43 +43 @@
     protected override void LoadSolution(Stream stream, TData instance) {
       using (var reader = new StreamReader(stream)) {
-        double costs = double.Parse(reader.ReadLine(), new CultureInfo("en-US"));
+        double costs = double.Parse(reader.ReadLine(), CultureInfo.InvariantCulture);
 
         var toursPerDepotQuery =
-          from line in ReadAllLines(reader)
+          from line in reader.ReadAllLines()
           where !string.IsNullOrEmpty(line)
           let tokens = line.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries)
           let depot = int.Parse(tokens[0])
           //let vehicle = int.Parse(tokens[1])
-          //let duration = double.Parse(tokens[2], new CultureInfo("en-US"))
-          //let load = double.Parse(tokens[3], new CultureInfo("en-US"))
+          //let duration = double.Parse(tokens[2], CultureInfo.InvariantCulture)
+          //let load = double.Parse(tokens[3], new CultureInfo.InvariantCulture)
           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 => double.Parse(t.Trim('(', ')'), new CultureInfo("en-US")))
+          //let serviceTimes = tokens.Skip(5).Where(t => t.StartsWith("(")).Select(t => double.Parse(t.Trim('(', ')'), CultureInfo.InvariantCulture))
           let stops = customers.Skip(1).Take(numberOfCustomers - 2).Select(s => s - 1)
           select new { depot, /*vehicle,*/ stops } into assignment
@@ -89 +89 @@
       return tourToVehicle.ToArray();
     }
-
-    private IEnumerable<string> ReadAllLines(StreamReader reader) {
-      while (!reader.EndOfStream)
-        yield return reader.ReadLine();
-    }
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/HeuristicLab.Problems.Instances.VehicleRouting-3.4.csproj

@@ -118 +118 @@
     <Compile Include="GoldenFormat\GoldenFormatInstanceProvider.cs" />
     <Compile Include="IVRPInstanceProvider.cs" />
+    <Compile Include="StreamReaderHelper.cs" />
     <Compile Include="TaillardFormat\TaillardInstanceProvider.cs" />
     <Compile Include="TaillardFormat\TaillardParser.cs" />

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/SolomonFormat/SolomonFormatInstanceProvider.cs

@@ -67 +67 @@
 
         var routesQuery =
-          from line in ReadAllLines(reader)
+          from line in reader.ReadAllLines()
           where !string.IsNullOrEmpty(line)
           let tokens = ExtractValue(line).Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries)
@@ -82 +82 @@
       return line.Split(new[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Last().Trim();
     }
-    private IEnumerable<string> ReadAllLines(StreamReader reader) {
-      while (!reader.EndOfStream)
-        yield return reader.ReadLine();
-    }
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/VRPInstanceProvider.cs

@@ -92 +92 @@
 
     protected virtual void LoadSolution(Stream stream, TData instance) {
+      LoadOptFile(stream, instance);
+    }
+
+    private void LoadOptFile(Stream stream, TData instance) {
       List<List<int>> routes = new List<List<int>>();
 
@@ -122 +126 @@
 
     public void LoadSolution(string path, TData instance) {
-      using (FileStream stream = new FileStream(path, FileMode.Open)) {
-        LoadSolution(stream, instance);
+      try {
+        using (var stream = new FileStream(path, FileMode.Open)) {
+          LoadSolution(stream, instance);
+        }
+      } catch (Exception) {
+        // new stream necessary because first try already read from stream
+        using (var stream = new FileStream(path, FileMode.Open)) {
+          LoadOptFile(stream, instance); // Fallback to .opt-Format
+        }
       }
     }