Changeset 3286 for trunk/sources/HeuristicLab.Core/3.3

Timestamp:

04/08/10 02:21:50 (15 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

Location:

trunk/sources/HeuristicLab.Core/3.3

Files:

• ItemArray.cs (modified) (1 diff)
• ItemCollection.cs (modified) (1 diff)
• ItemList.cs (modified) (1 diff)
• ItemSet.cs (modified) (1 diff)
• NamedItemCollection.cs (modified) (1 diff)

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

@@ -55 +55 @@
 
     public virtual IDeepCloneable Clone(Cloner cloner) {
-      ItemArray<T> clone = (ItemArray<T>)Activator.CreateInstance(this.GetType(), this.Select(x => (T)cloner.Clone(x)));
+      ItemArray<T> clone = (ItemArray<T>)Activator.CreateInstance(this.GetType());
       cloner.RegisterClonedObject(this, clone);
+      clone.array = this.Select(x => (T)cloner.Clone(x)).ToArray();
       return clone;
     }

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

@@ -51 +51 @@
 
     public virtual IDeepCloneable Clone(Cloner cloner) {
-      ItemCollection<T> clone = (ItemCollection<T>)Activator.CreateInstance(this.GetType(), this.Select(x => (T)cloner.Clone(x)));
+      ItemCollection<T> clone = (ItemCollection<T>)Activator.CreateInstance(this.GetType());
       cloner.RegisterClonedObject(this, clone);
+      clone.list = new List<T>(this.Select(x => (T)cloner.Clone(x)));
       return clone;
     }

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

@@ -55 +55 @@
 
     public virtual IDeepCloneable Clone(Cloner cloner) {
-      ItemList<T> clone = (ItemList<T>)Activator.CreateInstance(this.GetType(), this.Select(x => (T)cloner.Clone(x)));
+      ItemList<T> clone = (ItemList<T>)Activator.CreateInstance(this.GetType());
       cloner.RegisterClonedObject(this, clone);
+      clone.list = new List<T>(this.Select(x => (T)cloner.Clone(x)));
       return clone;
     }

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

@@ -54 +54 @@
 
     public virtual IDeepCloneable Clone(Cloner cloner) {
-      ItemSet<T> clone = (ItemSet<T>)Activator.CreateInstance(this.GetType(), this.Select(x => (T)cloner.Clone(x)));
+      ItemSet<T> clone = (ItemSet<T>)Activator.CreateInstance(this.GetType());
       cloner.RegisterClonedObject(this, clone);
+      clone.set = new HashSet<T>(this.Select(x => (T)cloner.Clone(x)));
       return clone;
     }

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

@@ -58 +58 @@
     }
     public virtual IDeepCloneable Clone(Cloner cloner) {
-      NamedItemCollection<T> clone = (NamedItemCollection<T>)Activator.CreateInstance(this.GetType(), this.Select(x => (T)cloner.Clone(x)));
+      NamedItemCollection<T> clone = (NamedItemCollection<T>)Activator.CreateInstance(this.GetType());
       cloner.RegisterClonedObject(this, clone);
+      foreach (string key in dict.Keys)
+        clone.dict.Add(key, (T)cloner.Clone(dict[key]));
       return clone;
     }