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

Timestamp:

03/05/07 11:07:44 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -409 +409 @@
 
 
+void HierarchyManager::PrintTimings(const bool lastSplitWasOsp)
+{
+        double sortTime, evalTime, nodeTime, splitTime, subdTime;
+
+        sortTime = mBvHierarchy->mSortTimer.TotalTime();
+        evalTime = mBvHierarchy->mEvalTimer.TotalTime();
+        nodeTime = mBvHierarchy->mNodeTimer.TotalTime();
+        splitTime = mBvHierarchy->mSplitTimer.TotalTime();
+        subdTime = mBvHierarchy->mSubdivTimer.TotalTime();
+
+        cout << "bvh times"
+                 << " sort : " << sortTime
+                 << " eval : " << evalTime
+                 << " node : " << nodeTime
+                 << " split: " << splitTime
+                 << " subd : " << subdTime << endl;
+
+        Debug << "bvh times"
+                << " sort : " << sortTime
+                 << " eval : " << evalTime
+                 << " node : " << nodeTime
+                 << " split: " << splitTime
+                 << " subd : " << subdTime << endl;
+
+        sortTime = mVspTree->mSortTimer.TotalTime();
+        evalTime = mVspTree->mEvalTimer.TotalTime();
+        nodeTime = mVspTree->mNodeTimer.TotalTime();
+        splitTime = mVspTree->mSplitTimer.TotalTime();
+        subdTime = mVspTree->mSubdivTimer.TotalTime();
+
+        cout << "vsp times"
+                 << " sort : " << sortTime
+                 << " eval : " << evalTime
+                 << " node : " << nodeTime
+                 << " split: " << splitTime
+                 << " subd : " << subdTime << endl;
+
+        Debug << "vsp times"
+                << " sort : " << sortTime
+                 << " eval : " << evalTime
+                 << " node : " << nodeTime
+                 << " split: " << splitTime
+                 << " subd : " << subdTime << endl;
+        cout << endl;
+        Debug << endl;
+}
+
+
 void HierarchyManager::ConstructInterleavedWithGradient(const VssRayContainer &sampleRays,
                                                                                                                 const ObjectContainer &objects,
@@ -518 +566 @@
                 //if (!lastSplitWasOsp)
                 {
+                        /////////////////
+                        // subdivide object space with respect to the objects
+
                         lastSplitWasOsp = true;
                         cout << "osp" << endl;
@@ -545 +596 @@
                 else
                 {
+                        /////////////////
+                        // subdivide view space with respect to the objects
+
                         lastSplitWasOsp = false;
                         cout << "vsp" << endl;
-                        
-                        /////////////////
-                        // subdivide view space with respect to the objects
 
                         // dirtied object space candidates
@@ -574 +625 @@
                                  << (int)dirtyOspList.size() << " dirtied candidates" << endl;
                 }
+
+                PrintTimings(lastSplitWasOsp);
         }
 
@@ -1845 +1898 @@
                 //cout << "priority: " << nodeWrapper->GetMergeCost() << endl;
                 // save the view cells if it is a leaf or if enough view cells have already been traversed
-                // because of the priority queue, this will be the optimal set of v
+                // because of the priority queue, this will be the optimal set of view cells
                 if (nodeWrapper->IsLeaf() || 
                         ((viewCells.size() + bvhNodes.size() + tqueue.size() + 1) >= maxSplits) ||
@@ -1887 +1940 @@
 
                 if (obj->Type() != Intersectable::BVH_INTERSECTABLE)
-                        cout << "error " << obj->Type() << endl;
+                {
+                        cout << "error: wrong object type detected: " << obj->Type() << endl;
+                        exit(0);
+                }
 
                 BvhNode *intersect = static_cast<BvhNode *>(obj);