Changeset 3280 for trunk/sources/HeuristicLab.Core

Timestamp:

04/07/10 05:22:33 (14 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

Location:

trunk/sources/HeuristicLab.Core/3.3

Files:

• DeepCloneable.cs (modified) (1 diff)
• Engine.cs (modified) (1 diff)
• Item.cs (modified) (1 diff)
• NamedItem.cs (modified) (1 diff)
• ParameterizedNamedItem.cs (modified) (5 diffs)
• Scope.cs (modified) (2 diffs)

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

@@ -29 +29 @@
   [StorableClass]
   public abstract class DeepCloneable : IDeepCloneable {
+    protected DeepCloneable() { }
+    [StorableConstructor]
+    protected DeepCloneable(bool deserializing) { }
+
     /// <summary>
     /// Creates a deep clone of this instance.

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

@@ -49 +49 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
+      if (ExecutionState == ExecutionState.Started) throw new InvalidOperationException(string.Format("Clone not allowed in execution state \"{0}\".", ExecutionState));
       Engine clone = (Engine)base.Clone(cloner);
       IOperation[] contexts = executionStack.ToArray();

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

@@ -42 +42 @@
     }
 
+    protected Item() : base() { }
+    [StorableConstructor]
+    protected Item(bool deserializing) : base(deserializing) { }
+
+
     /// <summary>
     /// Gets the string representation of the current instance.

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

@@ -91 +91 @@
       else this.description = description;
     }
+    [StorableConstructor]
+    protected NamedItem(bool deserializing) : base(deserializing) { }
 
     /// <summary>

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

@@ -32 +32 @@
   [StorableClass]
   public abstract class ParameterizedNamedItem : NamedItem, IParameterizedNamedItem {
+    [Storable]
     private ParameterCollection parameters;
-    [Storable]
     protected ParameterCollection Parameters {
       get { return parameters; }
-      private set {
-        parameters = value;
-        readOnlyParameters = null;
-      }
     }
     private ReadOnlyObservableKeyedCollection<string, IParameter> readOnlyParameters;
@@ -53 +49 @@
       name = ItemName;
       description = ItemDescription;
-      Parameters = new ParameterCollection();
+      parameters = new ParameterCollection();
       readOnlyParameters = null;
     }
@@ -59 +55 @@
       : base(name) {
       description = ItemDescription;
-      Parameters = new ParameterCollection();
+      parameters = new ParameterCollection();
       readOnlyParameters = null;
     }
@@ -65 +61 @@
       : base(name) {
       description = ItemDescription;
-      Parameters = parameters;
+      this.parameters = parameters;
       readOnlyParameters = null;
     }
     protected ParameterizedNamedItem(string name, string description)
       : base(name, description) {
-      Parameters = new ParameterCollection();
+      parameters = new ParameterCollection();
       readOnlyParameters = null;
     }
     protected ParameterizedNamedItem(string name, string description, ParameterCollection parameters)
       : base(name, description) {
-      Parameters = parameters;
+      this.parameters = parameters;
       readOnlyParameters = null;
     }
+    [StorableConstructor]
+    protected ParameterizedNamedItem(bool deserializing) : base(deserializing) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       ParameterizedNamedItem clone = (ParameterizedNamedItem)base.Clone(cloner);
-      clone.Parameters = (ParameterCollection)cloner.Clone(parameters);
+      clone.parameters = (ParameterCollection)cloner.Clone(parameters);
+      clone.readOnlyParameters = null;
       return clone;
     }
@@ -87 +86 @@
     public virtual void CollectParameterValues(IDictionary<string, IItem> values) {
       foreach (IValueParameter param in parameters.OfType<IValueParameter>()) {
-        values.Add(param.Name, param.Value != null ? (IItem)param.Value.Clone() : null);
+        values.Add(param.Name, param.Value);
         if (param.Value is IParameterizedItem) {
           Dictionary<string, IItem> children = new Dictionary<string, IItem>();

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

@@ -35 +35 @@
       get { return parent; }
       set {
-        if (parent != null) parent.SubScopes.Remove(this);
-        parent = value;
-        if ((parent != null) && !parent.SubScopes.Contains(this)) parent.SubScopes.Add(this);
+        if (parent != value) {
+          IScope oldParent = parent;
+          parent = null;
+          if (oldParent != null) oldParent.SubScopes.Remove(this);
+          parent = value;
+          if ((parent != null) && !parent.SubScopes.Contains(this)) parent.SubScopes.Add(this);
+        }
       }
     }
@@ -97 +101 @@
       clone.Description = Description;
       if (variables.Count > 0) clone.variables = (VariableCollection)cloner.Clone(variables);
-      if (subScopes.Count > 0) clone.SubScopes = (ScopeList)cloner.Clone(subScopes);
+      if (subScopes.Count > 0) {
+        clone.SubScopes = (ScopeList)cloner.Clone(subScopes);
+        foreach (IScope child in clone.SubScopes)
+          child.Parent = clone;
+      }
       return clone;
     }