bug fix

Author: splitice

QuadTrees/Common/QuadTreeCommon.cs

@@ -274,13 +274,11 @@ public bool RemoveAll(Func<TObject,bool> whereExpr)
                 if (!whereExpr(kv.Key)) continue;
                 set.Add(kv.Value);
             }
-            var parents = new HashSet<TNode>();
             foreach (var s in set)
             {
                 var owner = s.Owner;
                 if (owner.Parent != null)
                 {
-                    parents.Add(owner.Parent);
                     Debug.Assert(owner.Parent.GetChildren().Any((a) => a == owner));
                 }
                 bool qtRemoved = owner.Remove(s);
@@ -289,22 +287,22 @@ public bool RemoveAll(Func<TObject,bool> whereExpr)
                 Debug.Assert(dictRemoved);
                 Debug.Assert(WrappedDictionary.Count == QuadTreePointRoot.Count);
             }
+            var ret = set.Count != 0;
             Debug.Assert(WrappedDictionary.Count == QuadTreePointRoot.Count);
-            do
+            var done = new HashSet<TNode>();
+            foreach (var qto in set)
             {
-                var parents2 = new HashSet<TNode>();
-                foreach (var p in parents)
+                while (qto.Owner != null && done.Add(qto.Owner))
                 {
-                    if (p.CleanThis() && p.Parent != null)
+                    if (qto.Owner.CleanThis())
                     {
-                        parents2.Add(p.Parent);
+                        qto.Owner = qto.Owner.Parent;
                     }
                 }
-                parents = parents2;
-            } while (parents.Count != 0); 
+            }
 
             Debug.Assert(WrappedDictionary.Count == QuadTreePointRoot.Count);
-            return set.Count != 0;
+            return ret;
         }
 
         #endregion

QuadTrees/Common/QuadTreeNodeCommon.cs

@@ -382,11 +382,12 @@ internal bool CleanThis()
                         }
                         Debug.Assert(origCount + child._objectCount == Count);
                     }
-                    child.Clear();
                     if (child._objects != null)
                     {
                         Debug.Assert(child._objects.Take(child._objectCount).All(a => a.Owner != child));
                     }
+                    child.Clear();
+                    Debug.Assert(child.IsEmpty);
                 }
                 else if (emptyChildren != 0 && !HasAtleast(MaxOptimizeDeletionReAdd))
                 {
@@ -401,7 +402,7 @@ internal bool CleanThis()
                     {
                         c.Parent = null;
                     }
-                    Clear();
+                    ClearRecursive();
                     AddBulk(buffer.Keys.ToArray(), (a) => buffer[a]);
 #if DEBUG
                     Debug.Assert(_objects == null || _objects.All((a) => a == null || a.Owner != oldOwners[a.Data] || a.Owner == this));
@@ -413,11 +414,19 @@ internal bool CleanThis()
                 }
                 Debug.Assert(Count == beforeCount);
                 Debug.Assert(_objects == null || _objects.All((a) => a == null || a.Owner == this));
-                return true;
             }
             return true;
         }
 
+        private void ClearRecursive()
+        {
+            foreach (var child in GetChildren())
+            {
+                child.ClearRecursive();
+            }
+            Clear();
+        }
+
         private UInt32 EncodeMorton2(UInt32 x, UInt32 y)
         {
             return (Part1By1(y) << 1) + Part1By1(x);
@@ -853,7 +862,7 @@ public void GetAllObjects(Action<QuadTreeObject<T,TNode>> put)
 
                 for (int i = 0; i < _objectCount; i++)
                 {
-                    Debug.Assert(_objects[i].Owner == this);
+                    if (_objects[i].Owner != this) break;//todo: better?
                     put(_objects[i]);
                 }
             }