Changeset 6205

Timestamp:

05/17/11 00:09:59 (14 years ago)

Author:

cneumuel

Message:

#1522

• simplified check for EventHandler (by simply checking for delegate)
• special handling types which use a hashtable internally (dictionaries, hashset, hashtable, ...) (as discussed with swagner)
• added testcase which shows a stack overflow if ThreadLocal is included and compiler is on Debug (it does not happen in Release)

Location:

trunk/sources

Files:

• HeuristicLab.Common/3.3/ObjectExtensions.cs (modified) (4 diffs)
• HeuristicLab/3.3/Tests/AlgorithmExtensions.cs (added)
• HeuristicLab/3.3/Tests/CollectObjectGraphTest.cs (modified) (2 diffs)
• HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj (modified) (2 diffs)

trunk/sources/HeuristicLab.Common/3.3/ObjectExtensions.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Reflection;
-using System.Collections;
+using System.Threading;
 
 namespace HeuristicLab.Common {
@@ -35 +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;
-      if (obj is Pointer) return;
       Type type = obj.GetType();
-      if (type.IsSubclassOfRawGeneric(typeof(EventHandler<>))) return;
-      if (type.IsPrimitive || type == typeof(string) || type == typeof(decimal)) return;
-      if (type.HasElementType) {
-        Type elementType = type.GetElementType();
-        if (elementType.IsPrimitive || elementType == typeof(string) || elementType == typeof(decimal)) return;
-        //TODO check all types
-      }
+      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) {
+      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);
@@ -69 +69 @@
           CollectObjectGraphObjects(value, objects);
         return;
-      } else 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;
@@ -80 +80 @@
       }
     }
+
+    private static bool ExcludeType(Type type) {
+      return type.IsPrimitive ||
+             type == typeof(string) || 
+             type == typeof(decimal) ||
+             typeof(Delegate).IsAssignableFrom(type) || 
+             typeof(Pointer).IsAssignableFrom(type);
+    }
   }
 }

trunk/sources/HeuristicLab/3.3/Tests/CollectObjectGraphTest.cs

@@ -24 +24 @@
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Algorithms.GeneticAlgorithm;
 using HeuristicLab.Common;
+using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.Xml;
+using HeuristicLab.Problems.TestFunctions;
+using HeuristicLab.Random;
+using HeuristicLab.SequentialEngine;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -82 +87 @@
       TestContext.WriteLine("");
     }
+
+    [TestMethod]
+    public void AlgorithmExecutions() {
+      var random = new MersenneTwister(0);
+      var algs = new List<IAlgorithm>();
+
+      Stopwatch sw = new Stopwatch();
+      for (int i = 0; i < 100; i++) {
+        GeneticAlgorithm ga = new GeneticAlgorithm();
+        ga.PopulationSize.Value = 5;
+        ga.MaximumGenerations.Value = 5;
+        ga.Engine = new SequentialEngine();
+        ga.Problem = new SingleObjectiveTestFunctionProblem();
+
+        sw.Start();
+        algs.Add(ga);
+
+        var cancellationTokenSource = new CancellationTokenSource();
+        ga.StartSync(cancellationTokenSource.Token);
+        sw.Stop();
+        TestContext.WriteLine("{0}: {1} ", i, sw.Elapsed);
+        sw.Reset();
+      }
+    }
   }
 }

trunk/sources/HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj

@@ -122 +122 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AlgorithmExtensions.cs" />
     <Compile Include="CloningConstructorTest.cs" />
     <Compile Include="CollectObjectGraphTest.cs" />
@@ -559 +560 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="GA_SymbReg2.hl">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />