Changeset 7622 for trunk/sources

Timestamp:

03/15/12 14:30:41 (13 years ago)

Author:

abeham

Message:

#1782: fixed two small bugs

Location:

trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3

Files:

• TSPLIBInstanceProvider.cs (modified) (1 diff)
• TSPLIBParser.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBInstanceProvider.cs

@@ -54 +54 @@
         using (var solutionsZipFile = new ZipInputStream(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName))) {
           foreach (var entry in GetZipContents(solutionsZipFile))
-            solutions.Add(entry.Substring(0, entry.Length - ".opt.tour".Length) + FileExtension, entry);
+            solutions.Add(entry.Substring(0, entry.Length - ".opt.tour".Length) + "." + FileExtension, entry);
         }
       }

trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBParser.cs

@@ -476 +476 @@
       var tours = new List<List<int>>();
       do {
-        string[] nodes = NextLine().Split(itemSeparator, StringSplitOptions.RemoveEmptyEntries);
+        var line = NextLine();
+        if (String.IsNullOrEmpty(line)) break;
+        string[] nodes = line.Split(itemSeparator, StringSplitOptions.RemoveEmptyEntries);
         if (!nodes.Any()) break;