Changeset 1750 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

11/14/06 22:32:51 (18 years ago)

Author:

mattausch

Message:

improved evaluation speed

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• HierarchyManager.cpp (modified) (5 diffs)
• HierarchyManager.h (modified) (2 diffs)
• Pvs.h (modified) (2 diffs)
• ViewCell.cpp (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (2 diffs)

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

@@ -1859 +1859 @@
 
 
+// TODO matt: implement this function for different storing methods
+void HierarchyManager::GetPvsIncrementally(ViewCell *vc, ObjectPvs &pvs) const
+{
+        ////////////////
+        //-- pvs is not stored with the interiors => reconstruct
+        ViewCell *root = vc;
+        
+        // add pvs from leaves
+        stack<ViewCell *> tstack;
+        tstack.push(vc);
+
+        while (!tstack.empty())
+        {
+                vc = tstack.top();
+                tstack.pop();
+        
+                // add newly found pvs to merged pvs: break here even for interior
+                if (!vc->GetPvs().Empty())
+                {
+                        pvs.MergeInPlace(vc->GetPvs());
+                }
+                else if (!vc->IsLeaf()) // interior cells: go down to leaf level
+                {
+                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
+
+                        for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                        {
+                                tstack.push(*it);
+                        }               
+                }
+        }
+}
+
 int HierarchyManager::ExtractStatistics(const int maxSplits,
                                                                                 const float maxMemoryCost,
@@ -1887 +1921 @@
         renderCost = 0.0f;
 
+        ViewCell::NewMail();
+
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
         {
+                ViewCell *vc = *vit;
+
                 float rc = 0;
-                ViewCell *vc = *vit;
-
-                ObjectPvs pvs;
+        ObjectPvs pvs;
                 mVspTree->mViewCellsTree->GetPvs(vc, pvs);
 
+                vc->SetPvs(pvs);
+
+                vc->Mail();
+
                 if (useFilter)
                 {
-                        ViewCellLeaf dummy;
-                        dummy.SetPvs(pvs);
                         ObjectPvs filteredPvs;
-                        mVspTree->mViewCellsManager->ApplyFilter2(&dummy, false, 1.0f, filteredPvs);
+                        mVspTree->mViewCellsManager->ApplyFilter2(vc, false, 1.0f, filteredPvs);
                         ComputePvs(filteredPvs, rc, pvsEntries);
                 }
@@ -1913 +1951 @@
 
         renderCost /= mVspTree->mViewCellsManager->GetViewSpaceBox().GetVolume();
-
         memory = pvsEntries * ObjectPvs::GetEntrySize();
 
         viewSpaceSplits = (int)viewCells.size();
         objectSpaceSplits = (int)bvhNodes.size();
-
         //cout << "viewCells: " << (int)viewCells.size() << " nodes: " << (int)bvhNodes.size() << " rc: " << renderCost << " entries: " << pvsEntries << endl;
+
+        // delete old "base" view cells if they are not leaves
+        ViewCellContainer::const_iterator oit, oit_end = mOldViewCells.end();
+
+        for (oit = mOldViewCells.begin(); oit != oit_end; ++ oit)
+        {
+                if (!(*oit)->Mailed() && !(*oit)->IsLeaf())
+                {
+                        (*oit)->GetPvs().Clear();
+                }
+        }
+
+        mOldViewCells = viewCells;
 
         return viewCells.size() + bvhNodes.size();
@@ -2099 +2148 @@
                                                                                         const bool useFilter)
 {
-        HierarchySubdivisionStats subStats;
-        
-        int splits = 0;
+        vector<HierarchySubdivisionStats> subStatsContainer;
+
+        int splits = (1 + mHierarchyStats.Leaves() / splitsStepSize) * splitsStepSize;
+        cout << "splits: " << splits << endl;
 
         while (1)
         {
+                HierarchySubdivisionStats subStats;
                 subStats.mNumSplits = ExtractStatistics(splits, 
                                                                                                 99999.0, 
@@ -2131 +2182 @@
                 subStats.mFullMemory = subStats.mMemoryCost + objectSpaceHierarchyMem + viewSpaceHierarchyMem;
                 
-                subStats.Print(splitsStats);
-                splits += splitsStepSize;
-
-                if (subStats.mNumSplits == mHierarchyStats.Leaves())
+                subStatsContainer.push_back(subStats);
+                
+                if (splits == 0)
                         break;
 
+                splits -= splitsStepSize;
+
                 cout << subStats.mNumSplits << " ";
         }
 
+        vector<HierarchySubdivisionStats>::const_reverse_iterator hit, hit_end = subStatsContainer.rend();
+
+        for (hit = subStatsContainer.rbegin(); hit != hit_end; ++ hit)
+        {
+                (*hit).Print(splitsStats);
+        }
+
+        // delete old "base" view cells: only pvss in the leaves are allowed
+        ViewCellContainer::const_iterator oit, oit_end = mOldViewCells.end();
+        for (oit = mOldViewCells.begin(); oit != oit_end; ++ oit)
+        {
+                if (!(*oit)->IsLeaf())
+                {
+                        (*oit)->GetPvs().Clear();
+                }
+        }
+
+        mOldViewCells.clear();
+
         cout << endl;
 }

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

@@ -527 +527 @@
 
         void ComputePvs(const ObjectPvs &pvs, float &rc, int &pvsEntries);
-
+        void GetPvsIncrementally(ViewCell *vc, ObjectPvs &pvs) const;
 protected:
 
@@ -639 +639 @@
         friend ViewCellsParseHandlers;
 
+        ViewCellContainer mOldViewCells;
 };
 

GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h

@@ -244 +244 @@
         /** Clears the pvs.
         */
-        void Clear();
+        void Clear(const bool trim = true);
+
+        void Trim();
 
         static int GetEntrySizeByte(); 
@@ -438 +440 @@
                 mergedPvs.mEntries.push_back(*bit);
         }
-}
-
-
-template <typename T, typename S> void Pvs<T, S>::Clear()
+        mergedPvs.mSamples = a.mSamples + b.mSamples;
+}
+
+
+template <typename T, typename S> void Pvs<T, S>::Clear(const bool trim = true)
 {
         mEntries.clear();
+        mSamples = 0;
+        vector<PvsEntry<T,S> >().swap(mEntries);
+}
+
+
+template <typename T, typename S> void Pvs<T, S>::Trim()
+{
+        vector<PvsEntry<T,S> >(mEntries).swap(mEntries);//trim vi
 }
 

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

@@ -1727 +1727 @@
         ////////////////
         //-- pvs is not stored with the interiors => reconstruct
-        Intersectable::NewMail();
-
         ViewCell *root = vc;
         
@@ -1748 +1746 @@
         
                 // add newly found pvs to merged pvs
-                //cout << "samples vc: " << vc->GetPvs().GetSamples() << " samples pvs: " << pvs.GetSamples() << endl;
                 pvs.MergeInPlace(vc->GetPvs());
-                //cout << "new samples: " << pvs.GetSamples() << endl;
+                
                 if (!vc->IsLeaf()) // interior cells: go down to leaf level
                 {

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

@@ -2615 +2615 @@
   float samples = (float)pvs.GetSamples();
   cout<<"Samples = "<<samples<<endl;
+   cout<<"size = "<<pvs.GetSize() <<endl;
   //  cout<<"Filter size = "<<filterSize<<endl;
   //  cout<<"vbox = "<<vbox<<endl;
@@ -6063 +6064 @@
                         Debug << "statistics computed in " << timeDiff * 1e-3 << " secs" << endl;
 
-#if 1
+#if 0
                         ////////////////////////////
                         // filtered stats