Changeset 11090

Timestamp:

07/04/14 17:43:00 (10 years ago)

Author:

abeham

Message:

#2203: merged to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting/3.3/CSharpScript.cs (modified) (1 diff)
• HeuristicLab.Scripting/3.3/VariableStore.cs (modified) (1 diff)

stable/HeuristicLab.Scripting/3.3/CSharpScript.cs

@@ -78 +78 @@
     protected CSharpScript(CSharpScript original, Cloner cloner)
       : base(original, cloner) {
-      variableStore = new VariableStore();
+      variableStore = cloner.Clone(original.variableStore);
     }
     public CSharpScript() {

stable/HeuristicLab.Scripting/3.3/VariableStore.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.IO;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Scripting {
   [Item("VariableStore", "Represents a variable store.")]
   [StorableClass]
-  public class VariableStore : ObservableDictionary<string, object>, IContent {
+  public class VariableStore : ObservableDictionary<string, object>, IContent, IDeepCloneable {
     [StorableConstructor]
     protected VariableStore(bool deserializing) : base(deserializing) { }
+    protected VariableStore(VariableStore original, Cloner cloner) {
+      cloner.RegisterClonedObject(original, this);
+      foreach (var kvp in original.dict) {
+        var clonedValue = kvp.Value as IDeepCloneable;
+        if (clonedValue != null) {
+          dict[kvp.Key] = cloner.Clone(clonedValue);
+        } else {
+          try {
+            dict[kvp.Key] = CloneByPersistence(kvp.Value);
+          } catch (PersistenceException pe) {
+            throw new NotSupportedException(string.Format(@"VariableStore: Variable ""{0}"" could not be cloned.", kvp.Key), pe);
+          }
+        }
+      }
+    }
     public VariableStore() : base() { }
+
+    public object Clone() {
+      return Clone(new Cloner());
+    }
+    public IDeepCloneable Clone(Cloner cloner) {
+      return new VariableStore(this, cloner);
+    }
+
+    protected T CloneByPersistence<T>(T value) {
+      using (var serializerStream = new MemoryStream()) {
+        XmlGenerator.Serialize(value, serializerStream);
+        var bytes = serializerStream.GetBuffer();
+        using (var deserializerStream = new MemoryStream(bytes)) {
+          return XmlParser.Deserialize<T>(deserializerStream);
+        }
+      }
+    }
   }
 }