Changeset 7467 for trunk

Timestamp:

02/14/12 09:19:39 (13 years ago)

Author:

mkommend

Message:

#1760:

• added possibility to exclude members from object graph traversal by name
• excluded runs from object graph traversal in the Algorithm
• adapted DeepCloneableCloningTest

Location:

trunk/sources

Files:

• HeuristicLab.Common/3.3/ObjectExtensions.cs (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs (modified) (1 diff)

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

@@ -31 +31 @@
 namespace HeuristicLab.Common {
   public static class ObjectExtensions {
-    public static IEnumerable<object> GetObjectGraphObjects(this object obj, bool excludeStaticMembers = false) {
+    public static IEnumerable<object> GetObjectGraphObjects(this object obj, HashSet<string> excludedMembers = null, bool excludeStaticMembers = false) {
       if (obj == null) return Enumerable.Empty<object>();
+      if (excludedMembers == null) excludedMembers = new HashSet<string>();
 
       var objects = new HashSet<object>();
@@ -42 +43 @@
         objects.Add(current);
 
-        foreach (object o in GetChildObjects(current, excludeStaticMembers)) {
+        foreach (object o in GetChildObjects(current, excludedMembers, excludeStaticMembers)) {
           if (o != null && !objects.Contains(o) && !ExcludeType(o.GetType()))
             stack.Push(o);
@@ -70 +71 @@
              (type.HasElementType && ExcludeType(type.GetElementType()));
     }
-    private static IEnumerable<object> GetChildObjects(object obj, bool excludeStaticMembers) {
+    private static IEnumerable<object> GetChildObjects(object obj, HashSet<string> excludedMembers, bool excludeStaticMembers) {
       Type type = obj.GetType();
 
@@ -95 +96 @@
       } else {
         foreach (FieldInfo f in type.GetAllFields()) {
+          if (excludedMembers.Contains(f.Name)) continue;
           if (excludeStaticMembers && f.IsStatic) continue;
           object fieldValue;
           try {
             fieldValue = f.GetValue(obj);
-          } catch (SecurityException) {
+          }
+          catch (SecurityException) {
             continue;
           }

trunk/sources/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

@@ -265 +265 @@
       ExecutionState = ExecutionState.Prepared;
       ExecutionTime = TimeSpan.Zero;
-      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects().OfType<IStatefulItem>()) {
+      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects(new HashSet<string>() { "runs" }).OfType<IStatefulItem>()) {
         statefulObject.InitializeState();
       }
@@ -286 +286 @@
     protected virtual void OnStopped() {
       ExecutionState = ExecutionState.Stopped;
-      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects().OfType<IStatefulItem>()) {
+      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects(new HashSet<string>() { "runs" }).OfType<IStatefulItem>()) {
         statefulObject.ClearState();
       }

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs

@@ -133 +133 @@
 
     private IEnumerable<object> CheckTotalInequality(object original, object clone) {
-      var originalObjects = new HashSet<object>(original.GetObjectGraphObjects(true).Where(x => !x.GetType().IsValueType), new ReferenceEqualityComparer());
-      var clonedObjects = new HashSet<object>(clone.GetObjectGraphObjects(true).Where(x => !x.GetType().IsValueType), new ReferenceEqualityComparer());
+      var originalObjects = new HashSet<object>(original.GetObjectGraphObjects(excludeStaticMembers: true).Where(x => !x.GetType().IsValueType), new ReferenceEqualityComparer());
+      var clonedObjects = new HashSet<object>(clone.GetObjectGraphObjects(excludeStaticMembers: true).Where(x => !x.GetType().IsValueType), new ReferenceEqualityComparer());
 
       return originalObjects.Intersect(clonedObjects);