Changeset 1733 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

Timestamp:

11/09/06 13:57:27 (18 years ago)

Author:

mattausch

Message:

removed bug from dirtycandidates

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

@@ -267 +267 @@
         splitQueue.Pop();
 
+        // split was not reevaluated before => do it now
+        if (splitCandidate->IsDirty())
+                splitCandidate->EvalCandidate();
+
         return splitCandidate;
 }
@@ -471 +475 @@
         {
                 // decide upon next split type
-                if (viewSpaceQueue.Top()->IsDirty())
-                        viewSpaceQueue.Top()->EvalCandidate();
-
-                if (objectSpaceQueue.Top()->IsDirty())
-                        objectSpaceQueue.Top()->EvalCandidate();
-
                 const float vspPriority = viewSpaceQueue.Top() ? viewSpaceQueue.Top()->GetPriority() : -1e20f;
                 const float ospPriority = objectSpaceQueue.Top() ? objectSpaceQueue.Top()->GetPriority() : -1e20f;
@@ -976 +974 @@
         while (!splitQueue.Empty())
         {
-                // reevaluate current candidate
-                if (splitQueue.Top()->IsDirty())
-                        splitQueue.Top()->EvalCandidate();
-                
                 const float priority = splitQueue.Top()->GetPriority();
                 const float threshold = oldCandidate ? oldCandidate->GetPriority() : 1e20f;