Changeset 4762

Timestamp:

11/10/10 13:39:14 (14 years ago)

Author:

epitzer

Message:

Correct cloning of ProgrammableOperator and ensure static initialization in storable constructor (#922)

File:

• trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs

@@ -75 +75 @@
 
     public readonly Dictionary<string, List<Assembly>> Plugins;
-
     protected Dictionary<Assembly, bool> Assemblies;
 
@@ -160 +159 @@
 
     #region Construction & Initialization
+
     [StorableConstructor]
-    protected ProgrammableOperator(bool deserializing) : base(deserializing) { }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      RegisterEvents();
+    protected ProgrammableOperator(bool deserializing)
+      : base(deserializing) {
+      ProgrammableOperator.StaticInitialize();
+      Assemblies = defaultAssemblyDict.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+      Plugins = defaultPluginDict.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.ToList());
     }
 
@@ -172 +173 @@
       executeMethod = original.executeMethod;
       Assemblies = original.Assemblies.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-      namespaces = original.namespaces;
+      Plugins = original.Plugins.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+      namespaces = new HashSet<string>(original.namespaces);
       CompilationUnitCode = original.CompilationUnitCode;
-      CompileErrors = original.CompileErrors;
+      CompileErrors = new CompilerErrorCollection(original.CompileErrors);
       RegisterEvents();
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new ProgrammableOperator(this, cloner);
     }
 
@@ -191 +190 @@
     }
 
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEvents();
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ProgrammableOperator(this, cloner);
+    }
 
     private void RegisterEvents() {
@@ -261 +268 @@
             assemblies.Add(a, false);
           }
-        }
-        catch (NotSupportedException) {
+        } catch (NotSupportedException) {
           // NotSupportedException is thrown while accessing 
           // the Location property of the anonymously hosted