Changeset 2526 for trunk/sources/HeuristicLab.Data/3.3

Timestamp:

11/23/09 16:43:34 (15 years ago)

Author:

swagner

Message:

Refactored cloning (#806)

Location:

trunk/sources/HeuristicLab.Data/3.3

Files:

• BoolData.cs (modified) (1 diff)
• DoubleData.cs (modified) (1 diff)
• IntData.cs (modified) (1 diff)
• ItemDictionary_T.cs (modified) (2 diffs)
• ItemList.cs (modified) (1 diff)
• ItemList_T.cs (modified) (2 diffs)
• NullData.cs (modified) (1 diff)
• ObjectData.cs (modified) (2 diffs)
• StringData.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Data/3.3/BoolData.cs

@@ -63 +63 @@
     /// <param name="clonedObjects">Dictionary of all already cloned objects.</param>
     /// <returns>The cloned instance as <see cref="BoolData"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+    public override IItem Clone(ICloner cloner) {
       BoolData clone = new BoolData();
-      clonedObjects.Add(Guid, clone);
+      cloner.RegisterClonedObject(this, clone);
       clone.Data = Data;
       return clone;

trunk/sources/HeuristicLab.Data/3.3/DoubleData.cs

@@ -64 +64 @@
     /// <param name="clonedObjects">Dictionary of all already cloned objects.</param>
     /// <returns>The cloned instance as <see cref="DoubleData"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+    public override IItem Clone(ICloner cloner) {
       DoubleData clone = new DoubleData();
-      clonedObjects.Add(Guid, clone);
+      cloner.RegisterClonedObject(this, clone);
       clone.Data = Data;
       return clone;

trunk/sources/HeuristicLab.Data/3.3/IntData.cs

@@ -64 +64 @@
     /// <param name="clonedObjects">Dictionary of all already cloned objects.</param>
     /// <returns>The cloned instance as <see cref="IntData"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+    public override IItem Clone(ICloner cloner) {
       IntData clone = new IntData();
-      clonedObjects.Add(Guid, clone);
+      cloner.RegisterClonedObject(this, clone);
       clone.Data = Data;
       return clone;

trunk/sources/HeuristicLab.Data/3.3/ItemDictionary_T.cs

@@ -46 +46 @@
     /// <param name="clonedObjects">A dictionary of all already cloned objects.</param>
     /// <returns>The cloned instance as <see cref="ItemDictionary&lt;K,V&gt;"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+    public override IItem Clone(ICloner cloner) {
       ItemDictionary<K,V> clone = new ItemDictionary<K,V>();
-      clonedObjects.Add(Guid, clone);
+      cloner.RegisterClonedObject(this, clone);
       foreach (KeyValuePair<K, V> item in dict) {
-        clone.dict.Add((K) Auxiliary.Clone(item.Key, clonedObjects), (V) Auxiliary.Clone(item.Value, clonedObjects));
+        clone.dict.Add((K) cloner.Clone(item.Key), (V) cloner.Clone(item.Value));
       }
       return clone;
@@ -300 +300 @@
           return ((IObjectData) obj).Data.GetHashCode(); 
         }
-        return obj.Guid.GetHashCode(); 
+        return obj.GetHashCode(); 
       }
     }

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

@@ -37 +37 @@
     /// <param name="clonedObjects">A dictionary of all already cloned objects.</param>
     /// <returns>The cloned instance as <see cref="ItemList"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+    public override IItem Clone(ICloner cloner) {
       ItemList clone = new ItemList();
-      clonedObjects.Add(Guid, clone);
-      base.CloneElements(clone, clonedObjects);
+      cloner.RegisterClonedObject(this, clone);
+      base.CloneElements(cloner, clone);
       return clone;
     }

trunk/sources/HeuristicLab.Data/3.3/ItemList_T.cs

@@ -52 +52 @@
     /// <param name="clonedObjects">A dictionary of all already cloned objects.</param>
     /// <returns>The cloned instance as <see cref="ItemList&lt;T&gt;"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+    public override IItem Clone(ICloner cloner) {
       ItemList<T> clone = new ItemList<T>();
-      clonedObjects.Add(Guid, clone);
-      CloneElements(clone, clonedObjects);
+      cloner.RegisterClonedObject(this, clone);
+      CloneElements(cloner, clone);
       return clone;
     }
@@ -66 +66 @@
     /// <param name="destination">The <see cref="ItemList&lt;T&gt;"/> where to save the cloned objects.</param>
     /// <param name="clonedObjects">A dictionary of all already cloned objects.</param>
-    protected void CloneElements(ItemList<T> destination, IDictionary<Guid, object> clonedObjects) {
+    protected void CloneElements(ICloner cloner, ItemList<T> destination) {
       for (int i = 0; i < list.Count; i++)
-        destination.list.Add((T) Auxiliary.Clone(list[i], clonedObjects));
+        destination.list.Add((T)cloner.Clone(list[i]));
     }
 

trunk/sources/HeuristicLab.Data/3.3/NullData.cs

@@ -55 +55 @@
     /// <param name="clonedObjects">All already cloned objects.</param>
     /// <returns>The cloned instance as <see cref="NullData"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+    public override IItem Clone(ICloner cloner) {
       NullData clone = new NullData();
-      clonedObjects.Add(Guid, clone);
+      cloner.RegisterClonedObject(this, clone);
       return clone;
     }

trunk/sources/HeuristicLab.Data/3.3/ObjectData.cs

@@ -52 +52 @@
     /// Clones the current instance.
     /// </summary>
-    /// <remarks>HeuristicLab data items are cloned with the <see cref="HeuristicLab.Core.Auxiliary.Clone"/> method of 
+    /// <remarks>HeuristicLab data items are cloned with the <see cref="HeuristicLab.Core.cloner.Clone"/> method of 
     /// class <see cref="Auxiliary"/> (deep copy), all other items (like basic data types) 
     /// are cloned with their own <c>Clone</c> methods (shadow copy).</remarks>
@@ -58 +58 @@
     /// <param name="clonedObjects">A dictionary of all already cloned objects.</param>
     /// <returns>The clone instance.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      ObjectData clone = (ObjectData)base.Clone(clonedObjects);
-      if (Data is IStorable)
-        clone.myData = Auxiliary.Clone((IStorable)Data, clonedObjects);
+    public override IItem Clone(ICloner cloner) {
+      ObjectData clone = (ObjectData)base.Clone(cloner);
+      if (Data is IItem)
+        clone.myData = cloner.Clone((IItem)Data);
       else if (Data is ICloneable)
         clone.myData = ((ICloneable)Data).Clone();

trunk/sources/HeuristicLab.Data/3.3/StringData.cs

@@ -64 +64 @@
     /// <param name="clonedObjects">A dictionary of all already cloned objects.</param>
     /// <returns>The coned instance as <see cref="StringData"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+    public override IItem Clone(ICloner cloner) {
       StringData clone = new StringData();
-      clonedObjects.Add(Guid, clone);
+      cloner.RegisterClonedObject(this, clone);
       clone.Data = Data;
       return clone;