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

Timestamp:

11/29/06 22:43:51 (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

@@ -274 +274 @@
 
 
+float HierarchyManager::EvalFullMem() const
+{
+        // question: should I also add the mem usage of the hierarchies?
+        const float objectSpaceMem = 16;//GetObjectSpaceMemUsage();
+        const float viewSpaceMem = 16;//mVspTree->GetMemUsage();
+        // HACK: the same value is used for view and object space
+        return mHierarchyStats.mMemory + mHierarchyStats.Leaves() * objectSpaceMem;
+}
+
+
 void HierarchyManager::EvalSubdivisionStats()
 {
-        // question: should I also add the mem usage of the hierarchies?
-        const float objectSpaceMem = GetObjectSpaceMemUsage();
-        const float viewSpaceMem = mVspTree->GetMemUsage();
-                
+        
         HierarchySubdivisionStats stats;
 
@@ -286 +293 @@
         stats.mEntriesInPvs = mHierarchyStats.mPvsEntries;
         stats.mMemoryCost = mHierarchyStats.mMemory  / float(1024 * 1024);
-        stats.mFullMemory = mHierarchyStats.mMemory  / float(1024 * 1024)
-                                                + objectSpaceMem + viewSpaceMem;
+        stats.mFullMemory = EvalFullMem() / float(1024 * 1024);
         stats.mViewSpaceSplits = mVspTree->mVspStats.Leaves();
         stats.mObjectSpaceSplits = GetObjectSpaceSubdivisionLeaves();
@@ -322 +328 @@
                 (0
                 || (mHierarchyStats.Leaves() >= mTermMaxLeaves) 
-                || (mHierarchyStats.mMemory >= mTermMaxMemory)
+                //|| (mHierarchyStats.mMemory >= mTermMaxMemory)
+                || (EvalFullMem() >= mTermMaxMemory)
                 || candidate->GlobalTerminationCriteriaMet()
                 //|| (mHierarchyStats.mRenderCostDecrease < mMinRenderCostDecrease)
@@ -335 +342 @@
                 Debug << "cost misses: " << mHierarchyStats.mGlobalCostMisses << " " << mTermGlobalCostMissTolerance << endl;
                 Debug << "memory: " << mHierarchyStats.mMemory << " " << mTermMaxMemory << endl;
+                Debug << "full memory: " << EvalFullMem() << " " << mTermMaxMemory << endl;
         }
 #endif