Changeset 885 for branches/CloningRefactorBranch/HeuristicLab.Data/ItemDictionary_T.cs

Timestamp:

12/02/08 14:13:06 (15 years ago)

Author:

gkronber

Message:

Refactored cloning in HL.Core, HL.Data and HL.Constraints

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

File:

• branches/CloningRefactorBranch/HeuristicLab.Data/ItemDictionary_T.cs (modified) (14 diffs)

branches/CloningRefactorBranch/HeuristicLab.Data/ItemDictionary_T.cs

@@ -1 +1 @@
 using System;
-using System.Collections; 
+using System.Collections;
 using System.Collections.Generic;
 using System.Text;
@@ -12 +12 @@
   /// <typeparam name="K">The type of the keys, which must implement the interface <see cref="IItem"/>.</typeparam>
   /// <typeparam name="V">The type of the values, which must imlement the interface <see cref="IItem"/>.</typeparam>
-  public class ItemDictionary<K,V> : ItemBase, IDictionary<K,V> 
+  public class ItemDictionary<K, V> : ItemBase, IDictionary<K, V>
     where K : IItem
-    where V : IItem{
+    where V : IItem {
     private Dictionary<K, V> dict;
 
@@ -34 +34 @@
     }
 
+    /// <summary>
+    /// Copy constructor to create clones (deep).
+    /// </summary>
+    /// <param name="original">The original instance to be cloned.</param>
+    public ItemDictionary(ItemDictionary<K, V> original) : this(original, new Dictionary<Guid, object>()) { }
+
+    /// <summary>
+    /// Copy constructor to create clones (deep) reusing already cloned object references.
+    /// </summary>
+    /// <param name="original">The instance to be cloned.</param>
+    /// <param name="clonedObjects">Already cloned objects (for referential integrity).</param>
+    protected ItemDictionary(ItemDictionary<K, V> original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      foreach (KeyValuePair<K, V> item in original.dict) {
+        this.dict.Add((K)Auxiliary.Clone(item.Key, clonedObjects), (V)Auxiliary.Clone(item.Value, clonedObjects));
+      }
+    }
+
     #region ItemBase Members
     /// <summary>
@@ -40 +58 @@
     /// <returns>The created instance as <see cref="ItemDictionaryView&lt;K,V&gt;"/>.</returns>
     public override IView CreateView() {
-      return new ItemDictionaryView<K,V>(this);
-    }
-
-    /// <summary>
-    /// Clones the current instance and adds it to the dictionary <paramref name="clonedObjects"/>.
+      return new ItemDictionaryView<K, V>(this);
+    }
+
+    /// <summary>
+    /// Clones the current instance using the copy constructor.
     /// </summary>
     /// <remarks>Also the keys and values in the dictionary are cloned and saved to the dictionary <paramref name="clonedObjects"/>,
@@ -51 +69 @@
     /// <returns>The cloned instance as <see cref="ItemDictionary&lt;K,V&gt;"/>.</returns>
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      ItemDictionary<K,V> clone = new ItemDictionary<K,V>();
-      clonedObjects.Add(Guid, clone);
-      foreach (KeyValuePair<K, V> item in dict) {
-        clone.dict.Add((K) Auxiliary.Clone(item.Key, clonedObjects), (V) Auxiliary.Clone(item.Value, clonedObjects));
-      }
-      return clone;
+      return new ItemDictionary<K, V>(this, clonedObjects);
     }
 
@@ -74 +87 @@
       foreach (KeyValuePair<K, V> item in dict) {
         XmlNode keyNode = PersistenceManager.Persist("Key", item.Key, document, persistedObjects);
-        XmlNode valueNode = PersistenceManager.Persist("Val", item.Value, document, persistedObjects); 
-        XmlNode pairNode = document.CreateNode(XmlNodeType.Element, "KeyValuePair", null); 
-        pairNode.AppendChild(keyNode); 
-        pairNode.AppendChild(valueNode); 
-        node.AppendChild(pairNode); 
-      }
-      return node; 
+        XmlNode valueNode = PersistenceManager.Persist("Val", item.Value, document, persistedObjects);
+        XmlNode pairNode = document.CreateNode(XmlNodeType.Element, "KeyValuePair", null);
+        pairNode.AppendChild(keyNode);
+        pairNode.AppendChild(valueNode);
+        node.AppendChild(pairNode);
+      }
+      return node;
     }
 
@@ -94 +107 @@
       base.Populate(node, restoredObjects);
       for (int i = 0; i < node.ChildNodes.Count; i++) {
-        K key = (K) PersistenceManager.Restore(node.ChildNodes[i].SelectSingleNode("Key"), restoredObjects);
-        V val = (V) PersistenceManager.Restore(node.ChildNodes[i].SelectSingleNode("Val"), restoredObjects);
-        dict[key] = val; 
+        K key = (K)PersistenceManager.Restore(node.ChildNodes[i].SelectSingleNode("Key"), restoredObjects);
+        V val = (V)PersistenceManager.Restore(node.ChildNodes[i].SelectSingleNode("Val"), restoredObjects);
+        dict[key] = val;
       }
     }
@@ -154 +167 @@
     /// <c>false</c> if the key was not found.</returns>
     public bool Remove(K key) {
-      V value = dict[key]; 
+      V value = dict[key];
       bool removed = dict.Remove(key);
-      OnItemRemoved(key, value); 
-      return removed; 
+      OnItemRemoved(key, value);
+      return removed;
     }
 
@@ -191 +204 @@
     public void Add(KeyValuePair<K, V> item) {
       dict.Add(item.Key, item.Value);
-      OnItemAdded(item.Key, item.Value); 
+      OnItemAdded(item.Key, item.Value);
     }
 
@@ -201 +214 @@
     public void Clear() {
       dict.Clear();
-      OnCleared(); 
+      OnCleared();
     }
 
@@ -220 +233 @@
     /// <param name="arrayIndex"></param>
     public void CopyTo(KeyValuePair<K, V>[] array, int arrayIndex) {
-      throw new NotImplementedException(); 
+      throw new NotImplementedException();
     }
 
@@ -246 +259 @@
       if (removed) {
         OnItemRemoved(item.Key, item.Value);
-      } 
-      return removed; 
+      }
+      return removed;
     }
     #endregion
@@ -328 +341 @@
       public bool Equals(T x, T y) {
         if (x is IComparable) {
-          return (((IComparable) x).CompareTo(y) == 0); 
+          return (((IComparable)x).CompareTo(y) == 0);
         }
         if (y is IComparable) {
-          return (((IComparable) y).CompareTo(x) == 0); 
+          return (((IComparable)y).CompareTo(x) == 0);
         }
-        return x.Equals(y); 
+        return x.Equals(y);
       }
 
@@ -343 +356 @@
       public int GetHashCode(T obj) {
         if (obj is IObjectData) {
-          return ((IObjectData) obj).Data.GetHashCode(); 
+          return ((IObjectData)obj).Data.GetHashCode();
         }
-        return obj.Guid.GetHashCode(); 
+        return obj.Guid.GetHashCode();
       }
     }