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

Timestamp:

09/21/06 12:16:04 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -234 +234 @@
                 (0
                 || (mHierarchyStats.Leaves() >= mTermMaxLeaves) 
-                //|| (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
+                || (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
                 ||(candidate->GlobalTerminationCriteriaMet())
                 );
 
-        if (0 && terminationCriteriaMet)
+        if (1 && terminationCriteriaMet)
         {
                 Debug << "hierarchy global termination criteria met:" << endl;
@@ -382 +382 @@
         const bool vspSplit = (sc->Type() == SubdivisionCandidate::VIEW_SPACE);
 
+        if (!globalTerminationCriteriaMet)
+        {
+                // cost ratio of cost decrease / totalCost
+                const float costRatio = mCurrentCandidate->GetRenderCostDecrease() / mTotalCost;
+                Debug << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
+        
+                if (costRatio < mTermMinGlobalCostRatio)
+                {
+                        ++ mGlobalCostMisses;
+                }
+
+                mTotalCost -= mCurrentCandidate->GetRenderCostDecrease();
+        }
+
         if (vspSplit)
         {
@@ -481 +495 @@
         {
                 mCurrentCandidate = NextSubdivisionCandidate();    
-                mTotalCost -= mCurrentCandidate->GetRenderCostDecrease();
-
-                // cost ratio of cost decrease / totalCost
-                const float costRatio = mCurrentCandidate->GetRenderCostDecrease() / mTotalCost;
-
-                //Debug << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
-                if (costRatio < mTermMinGlobalCostRatio)
-                {
-                        ++ mGlobalCostMisses;
-                }
-                
+                        
                 ///////////////////
                 //-- subdivide leaf node
@@ -498 +502 @@
                 {
                         cout << mCurrentCandidate->Type() << " ";
-                        if (0) cout << "subdividing candidate " << ++ i << " of type " << mCurrentCandidate->Type() << endl;
+                        if (0) cout << "subdividing candidate " << ++ i << " of type " 
+                                                << mCurrentCandidate->Type() << endl;
                         mHierarchyStats.nodes += 2;