Changeset 11932 for stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ResourceRegressionInstanceProvider.cs
- Timestamp:
- 02/06/15 10:08:54 (9 years ago)
- Location:
- stable
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 11650-11651
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.Instances.DataAnalysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis merged: 11650
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ResourceRegressionInstanceProvider.cs
r11170 r11932 23 23 using System.Globalization; 24 24 using System.IO; 25 using System.IO.Compression; 25 26 using System.Linq; 26 27 using System.Reflection; 27 28 using System.Text.RegularExpressions; 28 29 using HeuristicLab.Problems.DataAnalysis; 29 using ICSharpCode.SharpZipLib.Zip;30 30 31 31 namespace HeuristicLab.Problems.Instances.DataAnalysis { … … 38 38 39 39 var instanceArchiveName = GetResourceName(FileName + @"\.zip"); 40 using (var instancesZipFile = new Zip File(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {40 using (var instancesZipFile = new ZipArchive(GetType().Assembly.GetManifestResourceStream(instanceArchiveName), ZipArchiveMode.Read)) { 41 41 var entry = instancesZipFile.GetEntry(descriptor.ResourceName); 42 42 NumberFormatInfo numberFormat; 43 43 DateTimeFormatInfo dateFormat; 44 44 char separator; 45 using (Stream stream = instancesZipFile.GetInputStream(entry)) {45 using (Stream stream = entry.Open()) { 46 46 TableFileParser.DetermineFileFormat(stream, out numberFormat, out dateFormat, out separator); 47 47 } 48 48 49 49 TableFileParser csvFileParser = new TableFileParser(); 50 using (Stream stream = instancesZipFile.GetInputStream(entry)) {50 using (Stream stream = entry.Open()) { 51 51 csvFileParser.Parse(stream, numberFormat, dateFormat, separator, true); 52 52 }
Note: See TracChangeset
for help on using the changeset viewer.