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

Timestamp:

11/06/06 18:48:22 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -1747 +1747 @@
                 HierarchyNodeWrapper *nodeWrapper = tqueue.top();
                 tqueue.pop();
-
+                //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
@@ -1755 +1755 @@
                         )
                 {
-                        if (nodeWrapper->Type() == HierarchyNodeWrapper::VSP_NODE)
+                        if (nodeWrapper->Type() == HierarchyNodeWrapper::VIEW_CELL)
                         {
+                                //cout << "1";
                                 ViewCellWrapper *viewCellWrapper = dynamic_cast<ViewCellWrapper *>(nodeWrapper);
                                 viewCells.push_back(viewCellWrapper->mViewCell);
@@ -1762 +1763 @@
                         else
                         {
+                                //cout << "0";
                                 BvhNodeWrapper *bvhNodeWrapper = dynamic_cast<BvhNodeWrapper *>(nodeWrapper);
                                 bvhNodes.push_back(bvhNodeWrapper->mNode);
@@ -1776 +1778 @@
 
 
-bool HierarchyManager::ExtractStatistics(const int maxSplits,
-                                                                                 const float maxMemoryCost,
-                                                                                 float &renderCost,
-                                                                                 float &memory,
-                                                                                 int &pvsEntries)
+int HierarchyManager::ExtractStatistics(const int maxSplits,
+                                                                                const float maxMemoryCost,
+                                                                                float &renderCost,
+                                                                                float &memory,
+                                                                                int &pvsEntries)
 {
         ViewCellContainer viewCells;
@@ -1787 +1789 @@
         // collect best set of view cells for this #splits
     CollectBestSet(maxSplits, maxMemoryCost, viewCells, bvhNodes);
-
+        //cout << "here5 " << bvhNodes.size() << endl;
         vector<BvhNode *>::const_iterator bit, bit_end = bvhNodes.end();
         
+        // set new nodes to be active
         for (bit = bvhNodes.begin(); bit != bit_end; ++ bit)
         {
@@ -1797 +1800 @@
         ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
 
-        int numEntries = 0;
-        float pvsCost = 0.0f;
-
+        pvsEntries = 0;
+        renderCost = 0.0f;
+
+        //BvhNode::NewMail();
+        //int dummy = 0;
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
         {
+                float rc = 0;
                 ViewCell *vc = *vit;
                 ObjectPvs pvs;
                 mVspTree->mViewCellsTree->GetPvs(vc, pvs);
-
+                //dummy+=pvs.GetSize();
                 BvhNode::NewMail();
 
@@ -1814 +1820 @@
                 {
                         BvhIntersectable *intersect = dynamic_cast<BvhIntersectable *>((*oit).first);
+
                         BvhLeaf *leaf = intersect->GetItem();
                         BvhNode *activeNode = leaf->GetActiveNode();
@@ -1821 +1828 @@
                                 activeNode->Mail();
 
-                                ++ numEntries;
-                                pvsCost += mBvHierarchy->EvalAbsCost(leaf->mObjects);
+                                ObjectContainer objects;
+                                activeNode->CollectObjects(objects);
+
+                                ++ pvsEntries;
+                                rc += mBvHierarchy->EvalAbsCost(objects);
+                                //cout << " pvs: " << mBvHierarchy->EvalAbsCost(leaf->mObjects);
                         }
                 }
-        }
-
-        return ((int)(viewCells.size() + bvhNodes.size()) < mHierarchyStats.Leaves());
+
+                rc *= vc->GetVolume();
+                renderCost += rc;
+        }
+
+        renderCost /= mVspTree->mViewCellsManager->GetViewSpaceBox().GetVolume();
+
+        memory = pvsEntries * ObjectPvs::GetEntrySize();
+        //cout << "viewCells: " << (int)viewCells.size() << " nodes: " << (int)bvhNodes.size() << " rc: " << renderCost << " entries: " << pvsEntries << endl;
+
+        return viewCells.size() + bvhNodes.size();
 }
 
@@ -1984 +2003 @@
 
 void HierarchyManager::EvaluateSubdivision2(ofstream &splitsStats,
-                                                                                        ofstream &memStats,
-                                                                                        const int splitsStepSize,
-                                                                                        const float memStepSize)
+                                                                                        const int splitsStepSize)
 {
         int splits = 0;
-        float mem = 15;
 
         float renderCost;
@@ -1997 +2013 @@
         while (1)
         {
-                if (!ExtractStatistics(splits, 99999.0, renderCost, memory, pvsEntries))
+                const int numSplits = ExtractStatistics(splits, 99999.0, renderCost, memory, pvsEntries);
+                
+                UpdateStats(splitsStats, numSplits, renderCost, pvsEntries, memory, 0);
+                splits += splitsStepSize;
+
+                if (numSplits == mHierarchyStats.Leaves())
                         break;
-
-                UpdateStats(splitsStats, splits, renderCost, pvsEntries, memory, 0);
-
-                splits += splitsStepSize;
-        }
-
-        while (1)
-        {
-                if (!ExtractStatistics(99999999, mem, renderCost, memory, pvsEntries))
-                        break;
-
-                UpdateStats(splitsStats, splits, renderCost, pvsEntries, memory, 0);
-
-                mem += memStepSize;
-        }
-
-}
-
-}
+        }
+}
+
+}