Changeset 6340 for branches/histogram/HeuristicLab.Common

Timestamp:

05/30/11 17:31:53 (13 years ago)

Author:

abeham

Message:

#1465

• updated branch from trunk

Location:

branches/histogram

Files:

• . (modified) (1 prop)
• HeuristicLab.Common/3.3/Cloner.cs (modified) (2 diffs)
• HeuristicLab.Common/3.3/ObjectExtensions.cs (modified) (3 diffs)

branches/histogram/HeuristicLab.Common/3.3/Cloner.cs

@@ -41 +41 @@
     /// <param name="item">The object which should be cloned.</param>
     /// <returns>A clone of the given object.</returns>
-    public IDeepCloneable Clone(IDeepCloneable obj) {
-      if (obj == null) return null;
-      IDeepCloneable clone;
-      if (mapping.TryGetValue(obj, out clone))
-        return clone;
-      else
-        return obj.Clone(this);
-    }
-    /// <summary>
-    /// Creates a deep clone of a given deeply cloneable object.
-    /// </summary>
-    /// <param name="item">The object which should be cloned.</param>
-    /// <returns>A clone of the given object.</returns>
     public T Clone<T>(T obj) where T : class, IDeepCloneable {
       if (obj == null) return null;
@@ -70 +57 @@
       mapping.Add(item, clone);
     }
+
+    /// <summary>
+    /// Checks if a clone is already registered for a given deeply cloneable item.
+    /// </summary>
+    /// <param name="item">The original object.</param>
+    /// <returns>True if a clone is already registered for the given item; false otherwise</returns>
+    public bool ClonedObjectRegistered(IDeepCloneable item) {
+      return mapping.ContainsKey(item);
+    }
+
   }
 }

branches/histogram/HeuristicLab.Common/3.3/ObjectExtensions.cs

@@ -23 +23 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Reflection;
 using System.Threading;
@@ -36 +37 @@
     /// Types not collected:
     ///   * System.Delegate
-    ///   * System.EventHandler (+ System.EventHandler<T>)
+    ///   * System.Reflection.Pointer
     ///   * Primitives (Boolean, Byte, SByte, Int16, UInt16, Int32, UInt32, Int64, UInt64, IntPtr, UIntPtr, Char, Double, Single)
     ///   * string, decimal
-    ///   * Arrays of primitives (+ string, decimal)
-    /// Types of which the fields are not further collected:
-    ///   * System.Type
-    ///   * System.Threading.ThreadLocal<T>
+    ///   * Arrays of types not collected
+    ///   
+    /// Dictionaries and HashSets are treated specially, because it is cheaper to iterate over their keys and values
+    /// compared to traverse their internal data structures.
     /// </summary>
     private static void CollectObjectGraphObjects(this object obj, HashSet<object> objects) {
       if (obj == null || objects.Contains(obj)) return;
-      if (obj is Delegate || obj is EventHandler) return; 
       Type type = obj.GetType();
-      if (type.IsSubclassOfRawGeneric(typeof(EventHandler<>))) return;
-      if (type.IsPrimitive || type == typeof(string) || type == typeof(decimal)) return;
-      if (type.IsArray) {
-        Type elementType = type.GetElementType();
-        if (elementType.IsPrimitive || elementType == typeof(string) || elementType == typeof(decimal)) return;
-      }
+      if (ExcludeType(type)) return;
+      if (type.HasElementType && ExcludeType(type.GetElementType())) return;
 
       objects.Add(obj);
 
-      if (typeof(Type).IsInstanceOfType(obj)) return; // avoid infinite recursion
-      if (type.IsSubclassOfRawGeneric(typeof(ThreadLocal<>))) return; // avoid stack overflow when the field `ConcurrentStack<int> s_availableIndices` grows large
-
-      // performance critical to handle dictionaries in a special way
-      var dictionary = obj as IDictionary;
-      if (dictionary != null) {
-        foreach (object value in dictionary.Keys) {
+      if (type.IsSubclassOfRawGeneric(typeof(ThreadLocal<>))) return; // avoid stack overflow when the field `ConcurrentStack<int> s_availableIndices` too grows large
+      
+      // performance critical to handle dictionaries, hashsets and hashtables in a special way
+      if (type.IsSubclassOfRawGeneric(typeof(Dictionary<,>)) || 
+          type.IsSubclassOfRawGeneric(typeof(SortedDictionary<,>)) || 
+          type.IsSubclassOfRawGeneric(typeof(SortedList<,>)) ||
+          obj is SortedList || 
+          obj is OrderedDictionary || 
+          obj is ListDictionary || 
+          obj is Hashtable) {        
+        var dictionary = obj as IDictionary;
+        foreach (object value in dictionary.Keys)
           CollectObjectGraphObjects(value, objects);
-        }
-        foreach (object value in dictionary.Values) {
+        foreach (object value in dictionary.Values)
           CollectObjectGraphObjects(value, objects);
-        }
         return;
-      }
-
-      if (type.IsArray) {
-        var array = obj as Array;
-        foreach (object value in array) {
+      } else if (type.IsArray || type.IsSubclassOfRawGeneric(typeof(HashSet<>))) {
+        var enumerable = obj as IEnumerable;
+        foreach (var value in enumerable)
           CollectObjectGraphObjects(value, objects);
-        }
         return;
       }
@@ -82 +78 @@
       foreach (FieldInfo f in type.GetAllFields()) {
         f.GetValue(obj).CollectObjectGraphObjects(objects);
-      }      
+      }
+    }
+
+    private static bool ExcludeType(Type type) {
+      return type.IsPrimitive ||
+             type == typeof(string) || 
+             type == typeof(decimal) ||
+             typeof(Delegate).IsAssignableFrom(type) || 
+             typeof(Pointer).IsAssignableFrom(type);
     }
   }