Changeset 14930 for branches/PersistenceReintegration

Timestamp:

05/04/17 19:53:35 (8 years ago)

Author:

gkronber

Message:

#2520 changed optimizer to use new persistence per default

Location:

branches/PersistenceReintegration

Files:

• HeuristicLab.Common/3.3/Content/ContentManager.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/Clipboard.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/PersistenceContentManager.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (5 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/DataAnalysisSolutionView.cs (modified) (1 diff)

branches/PersistenceReintegration/HeuristicLab.Common/3.3/Content/ContentManager.cs

@@ -57 +57 @@
     protected abstract IStorableContent LoadContent(string filename);
 
-    public static void Save(IStorableContent content, string filename, bool compressed) {
+    public static void Save(IStorableContent content, string filename) {
       if (instance == null) throw new InvalidOperationException("ContentManager is not initialized.");
-      instance.SaveContent(content, filename, compressed);
+      instance.SaveContent(content, filename);
       content.Filename = filename;
     }
-    public static void SaveAsync(IStorableContent content, string filename, bool compressed, Action<IStorableContent, Exception> savingCompletedCallback) {
+    public static void SaveAsync(IStorableContent content, string filename, Action<IStorableContent, Exception> savingCompletedCallback) {
       if (instance == null) throw new InvalidOperationException("ContentManager is not initialized.");
-      var action = new Action<IStorableContent, string, bool>(instance.SaveContent);
-      action.BeginInvoke(content, filename, compressed, delegate (IAsyncResult result) {
+      var action = new Action<IStorableContent, string>(instance.SaveContent);
+      action.BeginInvoke(content, filename, delegate (IAsyncResult result) {
         Exception error = null;
         try {
@@ -77 +77 @@
 
     }
-    protected abstract void SaveContent(IStorableContent content, string filename, bool compressed);
+    protected abstract void SaveContent(IStorableContent content, string filename);
   }
 }

branches/PersistenceReintegration/HeuristicLab.Core.Views/3.3/Clipboard.cs

@@ -30 +30 @@
 using HeuristicLab.Common;
 using HeuristicLab.MainForm;
+using HeuristicLab.Persistence;
 using HeuristicLab.Persistence.Default.Xml;
 using HeuristicLab.PluginInfrastructure;
@@ -155 +156 @@
       foreach (string filename in items) {
         try {
-          T item = XmlParser.Deserialize<T>(filename);
+
+          #region backwards compatibility 
+          T item = null;
+          try {
+            item = XmlParser.Deserialize<T>(filename);
+          } catch(Exception e) { }
+          if (item == null)
+            item = (T)(new ProtoBufSerializer()).Deserialize(filename);
+          #endregion
           OnItemLoaded(item, progressBar.Maximum / items.Length);
         } catch (Exception) { }
@@ -197 +206 @@
           i++;
           SetEnabledStateOfContentViews(item, false);
-          XmlGenerator.Serialize(item, ItemsPath + Path.DirectorySeparatorChar + i.ToString("00000000") + ".hl", CompressionLevel.Optimal);
+          (new ProtoBufSerializer()).Serialize(item, ItemsPath + Path.DirectorySeparatorChar + i.ToString("00000000") + ".hl");
           OnItemSaved(item, progressBar.Maximum / listView.Items.Count);
         } catch (Exception) { } finally {

branches/PersistenceReintegration/HeuristicLab.Core/3.3/PersistenceContentManager.cs

@@ -20 +20 @@
 #endregion
 
-using System.IO.Compression;
+using System;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Core {
@@ -29 +28 @@
 
     protected override IStorableContent LoadContent(string filename) {
-      return XmlParser.Deserialize<IStorableContent>(filename);
+      #region backwards compatibility 
+      // try to deserialize with new serializer first
+      var serializer = new HeuristicLab.Persistence.ProtoBufSerializer();
+      IStorableContent content;
+      try {
+        content = (IStorableContent)serializer.Deserialize(filename);
+        return content;
+      } catch (Exception e) { }
+      return HeuristicLab.Persistence.Default.Xml.XmlParser.Deserialize<IStorableContent>(filename);
+      #endregion
     }
 
-    protected override void SaveContent(IStorableContent content, string filename, bool compressed) {
-      XmlGenerator.Serialize(content, filename, compressed ? CompressionLevel.Optimal : CompressionLevel.NoCompression);
+    protected override void SaveContent(IStorableContent content, string filename) {
+      // XmlGenerator.Serialize(content, filename, compressed ? CompressionLevel.Optimal : CompressionLevel.NoCompression);
+
+      var serializer = new HeuristicLab.Persistence.ProtoBufSerializer();
+      serializer.Serialize(content, filename);
     }
   }

branches/PersistenceReintegration/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs

@@ -206 +206 @@
         Title = "Save Item",
         DefaultExt = "hl",
-        Filter = "Uncompressed HeuristicLab Files|*.hl|HeuristicLab Files|*.hl|All Files|*.*",
-        FilterIndex = 2
+        Filter = "HeuristicLab Files|*.hl|All Files|*.*",
+        FilterIndex = 1
       };
 
@@ -219 +219 @@
             try {
               mainForm.AddOperationProgressToContent(activeView.Content, "Exporting data.");
-              ContentManager.Save(storable, saveFileDialog.FileName, compressed);
+              PersistenceContentManager.Save(storable, saveFileDialog.FileName);
             } finally {
               mainForm.RemoveOperationProgressFromContent(activeView.Content);

branches/PersistenceReintegration/HeuristicLab.Optimizer/3.3/FileManager.cs

@@ -78 +78 @@
         if (view == null)
           ErrorHandling.ShowErrorDialog("There is no view for the loaded item. It cannot be displayed.", new InvalidOperationException("No View Available"));
-      }
-      catch (Exception ex) {
+      } catch (Exception ex) {
         ErrorHandling.ShowErrorDialog((Control)MainFormManager.MainForm, "Cannot open file.", ex);
-      }
-      finally {
+      } finally {
         ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).ResetAppStartingCursor();
       }
@@ -101 +99 @@
           MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().SetAppStartingCursor();
           SetSaveOperationProgressInContentViews(content, true);
-          ContentManager.SaveAsync(content, content.Filename, true, SavingCompleted);
+          ContentManager.SaveAsync(content, content.Filename, SavingCompleted);
         }
       }
@@ -118 +116 @@
           saveFileDialog.Title = "Save Item";
           saveFileDialog.DefaultExt = "hl";
-          saveFileDialog.Filter = "Uncompressed HeuristicLab Files|*.hl|HeuristicLab Files|*.hl|All Files|*.*";
-          saveFileDialog.FilterIndex = 2;
+          saveFileDialog.Filter = "HeuristicLab Files|*.hl|All Files|*.*";
+          saveFileDialog.FilterIndex = 1;
         }
 
@@ -133 +131 @@
           MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().SetAppStartingCursor();
           SetSaveOperationProgressInContentViews(content, true, saveFileDialog.FileName);
-          if (saveFileDialog.FilterIndex == 1) {
-            ContentManager.SaveAsync(content, saveFileDialog.FileName, false, SavingCompleted);
-          } else {
-            ContentManager.SaveAsync(content, saveFileDialog.FileName, true, SavingCompleted);
-          }
+          ContentManager.SaveAsync(content, saveFileDialog.FileName, SavingCompleted);
         }
       }
@@ -145 +139 @@
         if (error != null) throw error;
         MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().UpdateTitle();
-      }
-      catch (Exception ex) {
+      } catch (Exception ex) {
         ErrorHandling.ShowErrorDialog((Control)MainFormManager.MainForm, "Cannot save file.", ex);
-      }
-      finally {
+      } finally {
         SetSaveOperationProgressInContentViews(content, false);
         MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().ResetAppStartingCursor();

branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/DataAnalysisSolutionView.cs

@@ -126 +126 @@
       if (loadProblemDataFileDialog.ShowDialog(this) != DialogResult.OK) return;
       try {
-        object hlFile = XmlParser.Deserialize(loadProblemDataFileDialog.FileName);
+        object hlFile = PersistenceContentManager.Load(loadProblemDataFileDialog.FileName);
 
         IDataAnalysisProblemData problemData = null;