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

Timestamp:

09/20/06 18:32:10 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -34 +34 @@
 
 
-HierarchyManager::HierarchyManager(VspTree *vspTree, 
-                                                                   const int objectSpaceSubdivisionType):
+HierarchyManager::HierarchyManager(const int objectSpaceSubdivisionType):
 mObjectSpaceSubdivisionType(objectSpaceSubdivisionType),
-mVspTree(vspTree), 
 mOspTree(NULL), 
 mBvHierarchy(NULL)
@@ -57 +55 @@
 
         // hierarchy manager links view space partition and object space partition
+        mVspTree = new VspTree();
         mVspTree->mHierarchyManager = this;
         
@@ -63 +62 @@
 
 
-HierarchyManager::HierarchyManager(VspTree *vspTree, KdTree *kdTree): 
+HierarchyManager::HierarchyManager(KdTree *kdTree): 
 mObjectSpaceSubdivisionType(KD_BASED_OBJ_SUBDIV),
-mVspTree(vspTree), 
 mBvHierarchy(NULL)
 {
@@ -71 +69 @@
         mOspTree->mVspTree = mVspTree;
 
+        mVspTree = new VspTree();
         mVspTree->mHierarchyManager = this;
 
@@ -120 +119 @@
 {
         DEL_PTR(mOspTree);
-        //DEL_PTR(mVspTree);
+        DEL_PTR(mVspTree);
         DEL_PTR(mBvHierarchy);
 }
@@ -232 +231 @@
 bool HierarchyManager::GlobalTerminationCriteriaMet(SubdivisionCandidate *candidate) const
 {
-        return (0
+        const bool terminationCriteriaMet = 
+                (0
                 || (mHierarchyStats.Leaves() >= mTermMaxLeaves) 
-                //|| (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
-                ||      candidate->GlobalTerminationCriteriaMet()
+                || (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
+                ||(candidate->GlobalTerminationCriteriaMet())
                 );
+
+        if (0 && terminationCriteriaMet)
+        {
+                Debug << "hierarchy global termination criteria met:" << endl;
+                Debug << "leaves: " << mHierarchyStats.Leaves() << " " << mTermMaxLeaves << endl;
+                Debug << "cost misses: " << mGlobalCostMisses << " " << mTermGlobalCostMissTolerance << endl;
+        }
+        return terminationCriteriaMet;
 }
 
@@ -306 +314 @@
                 mVspTree->PrepareConstruction(sampleRays, *viewSpaceRays);
 
+        mTotalCost = mVspTree->mTotalCost;
+        Debug << "\nreseting cost, new total cost: " << mTotalCost << endl;
+
         mTQueue.Push(vsc);
 }
@@ -328 +339 @@
 
 {
-        cout << "starting bv hierarchy construction ... " << endl;
+        const long startTime = GetTime();
+
+        cout << "preparing bv hierarchy construction ... " << endl;
         mBvHierarchy->CreateRoot(objects);
 
@@ -339 +352 @@
 
     mTQueue.Push(sc);
+        cout << "finished bv hierarchy preparation in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 }
 
@@ -357 +371 @@
 
         mTotalCost = mOspTree->mTotalCost;
-        Debug << "reseting cost, new total cost: " << mTotalCost << endl;
+        Debug << "\nreseting cost, new total cost: " << mTotalCost << endl;
         
     mTQueue.Push(osc);
@@ -739 +753 @@
 
 
-void HierarchyManager::PrintHierarchyStatistics(ofstream &stream) const
+void HierarchyManager::PrintHierarchyStatistics(ostream &stream) const
 {
         stream << mHierarchyStats << endl;
-
         stream << "\nview space:" << endl << endl;
         stream << mVspTree->GetStatistics() << endl;