Changeset 17034 for branches/2435-alglib_3_15/HeuristicLab.Optimizer/3.3/StartPage.cs

Timestamp:

06/25/19 23:14:06 (5 years ago)

Author:

mkommend

Message:

#2435: Updated branch with most recent trunk changes.

Location:

branches/2435-alglib_3_15

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimizer (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/StartPage.cs (modified) (3 diffs)

branches/2435-alglib_3_15/HeuristicLab.Optimizer/3.3/StartPage.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Windows.Forms;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.MainForm;
-using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Optimizer {
@@ -117 +118 @@
 
     private void LoadSample(string name, Assembly assembly, ListViewGroup group, int count) {
-      string path = Path.GetTempFileName();
-      try {
-        using (var stream = assembly.GetManifestResourceStream(name)) {
-          WriteStreamToTempFile(stream, path); // create a file in a temporary folder (persistence cannot load these files directly from the stream)
-          var item = XmlParser.Deserialize<INamedItem>(path);
+      using (var stream = assembly.GetManifestResourceStream(name)) {
+        var serializer = new ProtoBufSerializer();
+        // TODO remove deflateStream with next release of HEAL.Attic
+        using (var deflateStream = new DeflateStream(stream, CompressionMode.Decompress, true)) {
+          var item = (NamedItem)serializer.Deserialize(deflateStream, false);
           OnSampleLoaded(item, group, 1.0 / count);
-        }
-      } catch (Exception) {
-      } finally {
-        if (File.Exists(path)) {
-          File.Delete(path); // make sure we remove the temporary file
         }
       }
@@ -199 +195 @@
       Properties.Settings.Default.Save();
     }
-
-    #region Helpers
-    private void WriteStreamToTempFile(Stream stream, string path) {
-      using (FileStream output = new FileStream(path, FileMode.Create, FileAccess.Write)) {
-        stream.CopyTo(output);
-      }
-    }
-    #endregion
   }
 }