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

Timestamp:

10/23/06 20:24:14 (18 years ago)

Author:

mattausch

Message:

updated priority meaurement: taking total cost and memory into account

File:

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

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

@@ -358 +358 @@
         // hack: assume that object space can be seen from view space
         mHierarchyStats.mTotalCost = (float)objects.size();
+        // only one entry for start
         mHierarchyStats.mPvsEntries = 1;
-
-        const int entrySize = sizeof(PvsData) + sizeof(Intersectable *);
-        mHierarchyStats.mMemory = entrySize / (1024.0f * 1024.0f);
+        mHierarchyStats.mMemory = (float)ObjectPvs::GetEntrySizeByte();
 
         EvalSubdivisionStats();
@@ -396 +395 @@
         // for first round, use sah splits. Once view space partition
         // has started, use render cost heuristics instead
-        const int ospSteps = 
-                RunConstruction(objectSpaceQueue, dirtyVspList, renderCostDecr, minSteps);
+        const int ospSteps = RunConstruction(objectSpaceQueue, dirtyVspList, NULL, minSteps);
 
         cout << "\n" << ospSteps << " object space partition steps taken" << endl;
 
         // create view space
-        SubdivisionCandidate *vsc = 
-                        PrepareViewSpaceSubdivision(sampleRays, objects);
+        SubdivisionCandidate *vsc = PrepareViewSpaceSubdivision(sampleRays, objects);
 
         viewSpaceQueue.Push(vsc);
@@ -414 +411 @@
         // account so we can compare to view space splits
         ResetQueue(objectSpaceQueue, false);
-
-        //minSteps = 1;
 
         // This method subdivides view space / object space 
@@ -425 +420 @@
         while (!(viewSpaceQueue.Empty() && objectSpaceQueue.Empty()))
         {
-                float vspPriority;
+                // decide upon next split type
+                const float vspPriority =  viewSpaceQueue.Top() ? viewSpaceQueue.Top()->GetPriority() : -1e20;
+                const float ospPriority =  viewSpaceQueue.Top() ? objectSpaceQueue.Top()->GetPriority() : -1e20;
                 
-                // decide upon next split type
-                if (!viewSpaceQueue.Empty())
-                {
-                        vspPriority = viewSpaceQueue.Top()->GetPriority();
-
-                        // rather take this into account directly when computing priority
-                        if (0 && mConsiderMemory)
-                                vspPriority /= ((float)viewSpaceQueue.Top()->GetPvsEntriesIncr() + Limits::Small);
-                }
-                else
-                {
-                        vspPriority = 0;
-                }
-
-                float ospPriority;
-                
-                if (!objectSpaceQueue.Empty())
-                {
-                        ospPriority = objectSpaceQueue.Top()->GetPriority();
-                        
-                        // rather take this into account directly when computing priority
-                        if (0 && mConsiderMemory)
-                                ospPriority /= ((float)objectSpaceQueue.Top()->GetPvsEntriesIncr() + Limits::Small);
-                }
-                else
-                {
-                        ospPriority = 0;
-                }
-
                 cout << "new decicion, vsp: " << vspPriority << ", osp: " << ospPriority << endl;
 
@@ -471 +439 @@
                         // has started, use render cost heuristics instead
                         const int ospSteps = 
-                                RunConstruction(objectSpaceQueue, dirtyVspList, renderCostDecr, minSteps);
+                                RunConstruction(objectSpaceQueue, dirtyVspList, viewSpaceQueue.Top(), minSteps);
 
                         cout << "\n" << ospSteps << " object space partition steps taken" << endl;
@@ -493 +461 @@
                         // process view space candidates
                         const int vspSteps = 
-                                RunConstruction(viewSpaceQueue, dirtyOspList, renderCostDecr, minSteps);
+                                RunConstruction(viewSpaceQueue, dirtyOspList, objectSpaceQueue.Top(), minSteps);
 
                         cout << "\n" << vspSteps << " view space partition steps taken" << endl;
@@ -526 +494 @@
         mHierarchyStats.mNodes = 2; 
         mHierarchyStats.mPvsEntries = 1;
-        mHierarchyStats.mMemory = sizeof(PvsData) + sizeof(Intersectable *) / (1024.0f * 1024.0f);
+        mHierarchyStats.mMemory = (float)ObjectPvs::GetEntrySizeByte();
         mHierarchyStats.mTotalCost = (float)objects.size();
 
@@ -570 +538 @@
 
         // begin subdivision
-        RunConstruction(mRepairQueue, 
-                                        sampleRays, 
-                                        objects, 
-                                        forcedViewSpace);
+        RunConstruction(mRepairQueue, sampleRays, objects, forcedViewSpace);
         
         cout << "\nfinished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
@@ -734 +699 @@
         //cout << "pvs entries: " << pvsEntriesIncr << " " << mHierarchyStats.pvsEntries << endl;
 
-        const int sizeOfEntry = sizeof(PvsData) + sizeof(Intersectable *);
         // memory size in byte
-        mHierarchyStats.mMemory += float(pvsEntriesIncr * sizeOfEntry);
+        mHierarchyStats.mMemory += (float)ObjectPvs::GetEntrySizeByte();
         mHierarchyStats.mRenderCostDecrease = sc->GetRenderCostDecrease();
 
@@ -744 +708 @@
         {
                 memoryCount += 100000;
-                cout << "\nstorage cost: " << mHierarchyStats.mMemory / (1024.0f * 1024.0f) << ", steps: " << mHierarchyStats.Leaves() << endl;
+                cout << "\nstorage cost: " << mHierarchyStats.mMemory / float(1024 * 1024) << " MB, steps: " << mHierarchyStats.Leaves() << endl;
         }
 
@@ -930 +894 @@
 int HierarchyManager::RunConstruction(SplitQueue &splitQueue,
                                                                           SubdivisionCandidateContainer &dirtyCandidates,
-                                                                          const float minRenderCostDecr,
+                                                                          SubdivisionCandidate *oldCandidate,
                                                                           const int minSteps)
 {
@@ -939 +903 @@
         while (!splitQueue.Empty())
         {
+                const float threshold = oldCandidate ? oldCandidate->GetPriority() : 1e20;
                 SubdivisionCandidate *sc = NextSubdivisionCandidate(splitQueue); 
-                
+                //cout << "here2 " << sc->GetPriority() << " " << threshold << endl;
+
                 // minimum slope reached
-                if ((sc->GetRenderCostDecrease() < minRenderCostDecr) &&
-                        !(steps < minSteps))
-                {
-                        //cout << "breaking on " << sc->GetRenderCostDecrease() << " smaller than " << minRenderCostDecr << endl;
+                if ((sc->GetPriority() < threshold) && !(steps < minSteps))
+                {
+                        cout << "**************** breaking on " << sc->GetPriority() << " smaller than " << threshold << endl;
                         break;
                 }
+
                 ////////
                 //-- subdivide leaf node of either type
@@ -993 +959 @@
                         mHierarchyStats.mPvsEntries = mBvHierarchy->CountViewCells(objects);
 
-                        mHierarchyStats.mMemory = mHierarchyStats.mPvsEntries *
-                                sizeof(PvsData) + sizeof(Intersectable *) / (1024.0f * 1024.0f);
+                        mHierarchyStats.mMemory = 
+                                (float)mHierarchyStats.mPvsEntries * ObjectPvs::GetEntrySizeByte();
 
                         mHierarchyStats.mRenderCostDecrease = 0;
@@ -1038 +1004 @@
         mHierarchyStats.mRenderCostDecrease = 0;
 
-        mHierarchyStats.mMemory = mHierarchyStats.mPvsEntries * 
-                sizeof(PvsData) + sizeof(Intersectable *) / (1024.0f * 1024.0f);
+        mHierarchyStats.mMemory = (float)mHierarchyStats.mPvsEntries * ObjectPvs::GetEntrySizeByte();
 
         // evaluate new stats before first subdivsiion
@@ -1309 +1274 @@
                 const float rcd = sc->GetRenderCostDecrease();
                 
-                splitQueue.Erase(sc); // erase from queue
-                sc->EvalPriority(recomputeSplitPlaneOnRepair); // reevaluate
-                
+                // erase from queue
+                splitQueue.Erase(sc);
+                // reevaluate candidate
+                sc->EvalCandidate(recomputeSplitPlaneOnRepair);
+                 // reinsert
+                splitQueue.Push(sc);
+
+                cout << ".";
+
 #ifdef _DEBUG
                 Debug << "candidate " << sc << " reevaluated\n" 
@@ -1317 +1288 @@
                           << " old: " << rcd << " new " << sc->GetRenderCostDecrease() << endl;
 #endif  
-                splitQueue.Push(sc); // reinsert
-                cout << ".";
         }
 
@@ -1339 +1308 @@
                 SubdivisionCandidate *candidate = NextSubdivisionCandidate(splitQueue);
                  // reevaluate local split plane and priority
-                candidate->EvalPriority(recomputeSplitPlane);
+                candidate->EvalCandidate(recomputeSplitPlane);
                 cout << ".";
                 mCandidateBuffer.push_back(candidate);