Changeset 11661

Timestamp:

12/05/14 08:36:01 (10 years ago)

Author:

ascheibe

Message:

#1696 adapted FLA to changes of #2247

Location:

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape

Files:

• BoxChart/BoxChartCreator.cs (modified) (4 diffs)
• HeuristicLab.Analysis.FitnessLandscape.csproj (modified) (2 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/BoxChart/BoxChartCreator.cs

@@ -4 +4 @@
 using System.Drawing.Imaging;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using HeuristicLab.Collections;
@@ -12 +13 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using ICSharpCode.SharpZipLib.Zip;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.BoxCharts {
@@ -155 +155 @@
         filename = string.Format("{0}.zip", filename);
       using (var stream = File.Create(filename)) {
-        using (var zipStream = new ZipOutputStream(stream)) {
+        using (var zipArchive = new ZipArchive(stream, ZipArchiveMode.Create)) {
           foreach (var bitmap in bitmaps) {
-            zipStream.PutNextEntry(new ZipEntry(bitmap.Key) { DateTime = DateTime.Now });
-            using (var s = new MemoryStream()) {
+            var entry = zipArchive.CreateEntry(bitmap.Key);
+            using (var s = entry.Open()) {
               bitmap.Value.Save(s, ImageFormat.Png);
-              zipStream.Write(s.ToArray(), 0, (int)s.Length);
             }
           }
@@ -166 +165 @@
       }
     }
-
     #endregion
-
   }
 }

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/HeuristicLab.Analysis.FitnessLandscape.csproj

@@ -152 +152 @@
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Selection-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\trunk\sources\bin\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -161 +157 @@
     </Reference>
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Forms.DataVisualization" />