Changeset 11932 for stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification

Timestamp:

02/06/15 10:08:54 (10 years ago)

Author:

ascheibe

Message:

#2247 merged r11650, r11651 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/ResourceClassificationInstanceProvider.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/UCIInstanceProvider.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/ResourceClassificationInstanceProvider.cs

@@ -23 +23 @@
 using System.Globalization;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using HeuristicLab.Problems.DataAnalysis;
-using ICSharpCode.SharpZipLib.Zip;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -38 +38 @@
 
       var instanceArchiveName = GetResourceName(FileName + @"\.zip");
-      using (var instancesZipFile = new ZipFile(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {
+      using (var instancesZipFile = new ZipArchive(GetType().Assembly.GetManifestResourceStream(instanceArchiveName), ZipArchiveMode.Read)) {
         var entry = instancesZipFile.GetEntry(descriptor.ResourceName);
         NumberFormatInfo numberFormat;
         DateTimeFormatInfo dateFormat;
         char separator;
-        using (Stream stream = instancesZipFile.GetInputStream(entry)) {
+        using (Stream stream = entry.Open()) {
           TableFileParser.DetermineFileFormat(stream, out numberFormat, out dateFormat, out separator);
         }
 
         TableFileParser csvFileParser = new TableFileParser();
-        using (Stream stream = instancesZipFile.GetInputStream(entry)) {
+        using (Stream stream = entry.Open()) {
           csvFileParser.Parse(stream, numberFormat, dateFormat, separator, true);
         }

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/UCIInstanceProvider.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
-using ICSharpCode.SharpZipLib.Zip;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -56 +56 @@
       var solutionsArchiveName = GetResourceName(FileName + @"\.zip");
       if (!String.IsNullOrEmpty(solutionsArchiveName)) {
-        using (var solutionsZipFile = new ZipInputStream(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName))) {
+        using (var solutionsZipFile = new ZipArchive(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName), ZipArchiveMode.Read)) {
           IList<string> entries = new List<string>();
-          ZipEntry curEntry;
-          while ((curEntry = solutionsZipFile.GetNextEntry()) != null) {
+          foreach (var curEntry in solutionsZipFile.Entries) {
             entries.Add(curEntry.Name);
           }