Changeset 13460 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Instances

Timestamp:

12/14/15 18:59:13 (8 years ago)

Author:

gkronber

Message:

#1966:

• renamed creatables
• partially fixed bin packing problem instance provider

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Instances

Files:

• BPPInstanceProvider.cs (modified) (5 diffs)
• BPPORLIBParser.cs (modified) (3 diffs)
• Data/BPPORLIB.rar (deleted)
• Data/BPPORLIB.zip (added)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Instances/BPPInstanceProvider.cs

@@ -24 +24 @@
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
+using System.Windows.Forms;
 
 namespace HeuristicLab.Problems.Instances.BinPacking {
-  public class BPPORLIBInstanceProvider : ProblemInstanceProvider<BPPData> {
+  public class BPPORLIBInstanceProvider : ProblemInstanceProvider<BPPData>, IProblemInstanceProvider<BPPData> {
 
     public override string Name {
@@ -51 +53 @@
       if (String.IsNullOrEmpty(instanceArchiveName)) yield break;
 
-      using (var instanceStream = new ZipInputStream(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {
-        foreach (var entry in GetZipContents(instanceStream).OrderBy(x => x)) {
-          yield return new BPPORLIBDataDescriptor(Path.GetFileNameWithoutExtension(entry), GetDescription(), entry, null);
+
+      using (var file = new ZipArchive(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {
+
+        foreach (var entry in file.Entries.OrderBy(x => x.Name)) {
+          if (string.IsNullOrWhiteSpace(entry.Name)) continue;
+          yield return new BPPORLIBDataDescriptor(
+            name: Path.GetFileNameWithoutExtension(entry.Name), 
+            description: GetDescription(), 
+            instanceIdentifier: entry.FullName, 
+            solutionIdentifier: null);
         }
       }
@@ -60 +69 @@
     public override BPPData LoadData(IDataDescriptor id) {
       var descriptor = (BPPORLIBDataDescriptor)id;
-      var instanceArchiveName = GetResourceName("JSSPORLIB.zip");
-      using (var instancesZipFile = new ZipFile(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {
+      var instanceArchiveName = GetResourceName("BPPORLIB.zip");
+      using (var instancesZipFile = new ZipArchive(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {
         var entry = instancesZipFile.GetEntry(descriptor.InstanceIdentifier);
 
-        using (var stream = instancesZipFile.GetInputStream(entry)) {
+        using (var stream = entry.Open()) {
           var parser = new BPPORLIBParser();
           parser.Parse(stream);
@@ -84 +93 @@
       var instance = Load(parser);
       instance.Name = Path.GetFileName(path);
-      instance.Description = "Loaded from file \"" + path + "\" on " + DateTime.Now.ToString();
+      instance.Description = "Loaded from file \"" + path + "\" on " + DateTime.Now;
       return instance;
     }
@@ -120 +129 @@
         .SingleOrDefault(x => Regex.Match(x, @".*\.Data\." + fileName).Success);
     }
-
-    protected IEnumerable<string> GetZipContents(ZipInputStream zipFile) {
-      ZipEntry entry;
-      while ((entry = zipFile.GetNextEntry()) != null) {
-        yield return entry.Name;
-      }
-    }
   }
 }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Instances/BPPORLIBParser.cs

@@ -64 +64 @@
     /// <returns>True if the file was successfully read or false otherwise.</returns>
     public void Parse(Stream stream) {
-      var reader = new StreamReader(stream);    
-      var delim = new char[] { ' ', '\t' };     
+      var reader = new StreamReader(stream);
+      var delim = new char[] { ' ', '\t' };
       var problemClass = reader.ReadLine().Split(delim, StringSplitOptions.RemoveEmptyEntries);
 
@@ -118 +118 @@
         Description = "<Missing>";
       }
-      
+
 
     }
@@ -135 +135 @@
         else
           writer.WriteLine("{0,-5} {1,-5} {2,-5}", ItemMeasures[i][0], ItemMeasures[i][1], ItemMeasures[i][2]);
+
       }
       writer.Flush();