Changeset 889

Timestamp:

12/02/08 23:01:39 (15 years ago)

Author:

gkronber

Message:

fixed bugs

#285 (Cloning could be improved by creating objects at the bottom of the cloning chain with 'new' instead of the top with Activator.CreateInstance())

Location:

branches/CloningRefactorBranch

Files:

• HeuristicLab.Core/Scope.cs (modified) (1 diff)
• HeuristicLab.Data/ItemList_T.cs (modified) (1 diff)
• HeuristicLab.Data/ObjectData.cs (modified) (1 diff)

branches/CloningRefactorBranch/HeuristicLab.Core/Scope.cs

@@ -91 +91 @@
     protected Scope(Scope original, IDictionary<Guid, object> clonedObjects)
       : base(original, clonedObjects) {
-      this.myName = original.Name;
+      myName = original.Name;
+      myVariables = new Dictionary<string, IVariable>();
+      myAliases = new Dictionary<string, string>();
+      mySubScopes = new List<IScope>();
       foreach (IVariable variable in original.myVariables.Values)
         AddVariable((IVariable)Auxiliary.Clone(variable, clonedObjects));

branches/CloningRefactorBranch/HeuristicLab.Data/ItemList_T.cs

@@ -53 +53 @@
     protected ItemList(ItemList<T> original, IDictionary<Guid, object> clonedObjects)
       : base(original, clonedObjects) {
+      list = new List<T>();
       CloneElements(original, clonedObjects);
     }

branches/CloningRefactorBranch/HeuristicLab.Data/ObjectData.cs

@@ -67 +67 @@
     protected ObjectData(ObjectData original, IDictionary<Guid, object> clonedObjects)
       : base(original, clonedObjects) {
-      if (original.Data is IStorable)
+      if (original.Data is ValueType)
+        this.myData = original.Data;
+      else if (original.Data is IStorable)
         this.myData = Auxiliary.Clone((IStorable)original.Data, clonedObjects);
       else if (original.Data is ICloneable)