Changeset 1727 for trunk

Timestamp:

04/30/09 15:26:19 (16 years ago)

Author:

epitzer

Message:

Register event listeners during deserialization. (#603)

Location:

trunk/sources

Files:

• HeuristicLab.Core/3.3/OperatorBase.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Scope.cs (modified) (2 diffs)
• HeuristicLab.Operators/3.3/VariableInjector.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/3.3/OperatorBase.cs

@@ -93 +93 @@
       get { return myVariableInfos.Values; }
     }
-
-    [Storable]
+    
     private Dictionary<string, IVariable> myVariables;
-    /// <inheritdoc/>
+    /// <inheritdoc/>    
     public virtual ICollection<IVariable> Variables {
       get { return myVariables.Values; }
+    }
+
+    [Storable(Name="Variables")]
+    private List<IVariable> VariablePersistence {
+      get { return new List<IVariable>(myVariables.Values); }
+      set {
+        foreach (IVariable var in value) {
+          AddVariable(var);
+        }
+      }
     }
 

trunk/sources/HeuristicLab.Core/3.3/Scope.cs

@@ -32 +32 @@
   public class Scope : ItemBase, IScope {
 
+    [Storable]
     private IScope parent;
 
@@ -42 +43 @@
       get { return myName; }
     }
-
-    [Storable]
+    
     private IDictionary<string, IVariable> myVariables;
-    /// <inheritdoc/>
+    /// <inheritdoc/>    
     public ICollection<IVariable> Variables {
       get { return myVariables.Values; }
     }
 
+    [Storable(Name="Variables")]
+    private List<IVariable> VariablePersistence {
+      get { return new List<IVariable>(myVariables.Values); }
+      set {
+        foreach (IVariable var in value) {
+          AddVariable(var);
+        }
+      }
+    }
+    
     [Storable]
     private IDictionary<string, string> myAliases;

trunk/sources/HeuristicLab.Operators/3.3/VariableInjector.cs

@@ -112 +112 @@
 
     [Storable]
-    private KeyValuePair<Dictionary<IVariableInfo, IVariable>, Dictionary<IVariable, IVariableInfo>> MappingPersistence {
+    private KeyValuePair<Dictionary<IVariableInfo, IVariable>, Dictionary<IVariable, IVariableInfo>> VariableMappingPersistence {
       get {
         return new KeyValuePair<Dictionary<IVariableInfo, IVariable>, Dictionary<IVariable, IVariableInfo>>(