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

Timestamp:

03/07/07 16:26:58 (17 years ago)

Author:

mattausch

Message:

using mutationsamples for evaluation

File:

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

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

@@ -163 +163 @@
                 "Hierarchy.useTraversalTree", mUseTraversalTree);
 
-        // for comparing it with byte - value
-        mTermMaxMemory *= (1024.0f * 1024.0f);
-
         Debug << "******** Hierarchy Manager Options ***********" << endl;
         Debug << "max leaves: " << mTermMaxLeaves << endl;
@@ -182 +179 @@
         Debug << "max avg ray contribution: " << mMaxAvgRayContri << endl;
 
+        // for comparing it with byte - value
+        mTermMaxMemory *= (1024.0f * 1024.0f);
 
         switch (mConstructionType)
@@ -415 +414 @@
         double sortTime, evalTime, nodeTime, splitTime, subdTime, planeTime, collectTime, viewCellsTime;
 
-        sortTime = mBvHierarchy->mSort2Timer.TotalTime();
+        sortTime = mBvHierarchy->mSortTimer.TotalTime();
         evalTime = mBvHierarchy->mEvalTimer.TotalTime();
         nodeTime = mBvHierarchy->mNodeTimer.TotalTime();
@@ -534 +533 @@
         cout << "\n" << ospSteps << " object space partition steps taken" << endl;
 
-        // create view space
+        PrintTimings(true);
+
+        ///////////////
+        //-- create view space
         PrepareViewSpaceSubdivision(viewSpaceQueue, sampleRays, objects);
 
         dirtyList.clear();
-
         // view space subdivision started
         mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
@@ -554 +555 @@
 
                 dirtyList.clear();
+                PrintTimings(false);
         }
         else
@@ -1175 +1177 @@
                         mHierarchyStats.mTotalCost = mBvHierarchy->mTotalCost;
                         
-
                         //mHierarchyStats.mPvsEntries -= mBvHierarchy->mPvsEntries + 1;
                         mHierarchyStats.mPvsEntries = mBvHierarchy->CountViewCells(objects);