Changeset 650 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

Timestamp:

02/17/06 20:41:22 (19 years ago)

Author:

mattausch

Message:

added spatial hierarchy based merge tree

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp (modified) (16 diffs)

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

@@ -249 +249 @@
 
 
-void ViewCellInterior::SetupChildLink(ViewCell *l)
-{
-    mChildren.push_back(l);
-    l->mParent = this;
+void ViewCellInterior::SetupChildLink(ViewCell *vc)
+{
+    mChildren.push_back(vc);
+    vc->mParent = this;
 }
 
@@ -333 +333 @@
 
         MergeCandidate::sRenderCostWeight = mRenderCostWeight;
-
-        mStats.open("mergeStats.log");
 }
 
@@ -473 +471 @@
 
         // frequency stats are updated
-        const int statsOut = 1;
+        const int statsOut = 500;
 
         // passes are needed for statistics, because we don't want to record
@@ -493 +491 @@
 
         cout << "actual merge starts now ... " << endl;
-        
-        mStats << "#Pass\n" << pass << endl
-                   << "#Merged\n" << mergeStats.merged << endl 
-                   << "#ViewCells\n" << realNumActiveViewCells << endl 
-                   << "#RenderCostIncrease\n" << 0 << endl
-                   << "#TotalRenderCost\n" << totalRenderCost << endl
-                   << "#CurrentPvs\n" << 0 << endl
-                   << "#ExpectedCost\n" << realExpectedCost << endl
-                   << "#AvgRenderCost\n" << realAvgRenderCost << endl
-                   << "#Deviation\n" << mDeviation << endl
-                   << "#TotalPvs\n" << totalPvs << endl
-                   << "#PvsSizeDecrease\n0" << endl
-                   << "#Volume\n0" << endl
-                   //<< "#Siblings\n" << mergeStats.siblings << endl
-                   << endl;
 
         //-- use priority queue to merge leaf pairs
@@ -604 +587 @@
                         mergedVc->SetCost(realExpectedCost);
 
-                        if (((mergeStats.merged % statsOut) == 0) || 
-                        (realNumActiveViewCells == mMergeMinViewCells))
-                        {
+                        if ((mergeStats.merged % statsOut) == 0)
                                 cout << "merged " << mergeStats.merged << " view cells" << endl;
 
-                                mStats 
-                                        << "#Pass\n" << pass << endl
-                                        << "#Merged\n" << mergeStats.merged << endl 
-                                        << "#ViewCells\n" << realNumActiveViewCells << endl 
-                    << "#RenderCostIncrease\n" << renderCostIncr << endl
-                                        << "#TotalRenderCost\n" << totalRenderCost << endl
-                                        << "#CurrentPvs\n" << mergedVc->GetPvs().GetSize() << endl
-                    << "#ExpectedCost\n" << realExpectedCost << endl
-                                        << "#AvgRenderCost\n" << realAvgRenderCost << endl
-                                        << "#Deviation\n" << mDeviation << endl
-                                        << "#TotalPvs\n" << totalPvs << endl
-                                        << "#PvsSizeDecrease\n" << -pvsDiff << endl
-                                        << "#Volume\n" << mergedVc->GetVolume() << endl
-                                        << endl;
-                                
-                        }
                 }
                 else
@@ -663 +628 @@
                 // $$JB keep this 0 temporarilly
                 root->SetCost(0.0f);
-                
-                mStats 
-                        << "#Pass\n" << pass << endl
-                        << "#Merged\n" << mergeStats.merged << endl 
-                        << "#ViewCells\n" << realNumActiveViewCells << endl 
-            << "#RenderCostIncrease\n" << 0 << endl // TODO
-                        << "#TotalRenderCost\n" << totalRenderCost << endl
-                        << "#CurrentPvs\n" << root->GetPvs().GetSize() << endl
-            << "#ExpectedCost\n" << realExpectedCost << endl
-                        << "#AvgRenderCost\n" << realAvgRenderCost << endl
-                        << "#Deviation\n" << mDeviation << endl
-                        << "#TotalPvs\n" << totalPvs << endl
-                        << "#PvsSizeDecrease\n" << 0 << endl // TODO
-                        << "#Volume\n" << root->GetVolume() << endl
-                        << endl;
 
                 mRoot = root;
@@ -705 +655 @@
         mergeStats.mergeTime = TimeDiff(startTime, GetTime());
         mergeStats.Stop();
-
         Debug << mergeStats << endl << endl;
 
@@ -1302 +1251 @@
 
 
+void ViewCellsTree::ExportStats()
+{
+        TraversalQueue tqueue;
+
+        tqueue.push(mRoot);
+        int numViewCells = 1;
+        
+        const AxisAlignedBox3 box = mViewCellsManager->GetViewSpaceBox();
+        const float vol = box.GetVolume();
+
+        int totalPvs;
+        float totalRenderCost, float avgRenderCost, float expectedCost;
+
+        float deviation = 0;
+        totalPvs = (int)mRoot->GetPvs().GetSize();
+        totalRenderCost = avgRenderCost = expectedCost = (float)mRoot->GetPvs().GetSize();
+
+        ofstream stats;
+        stats.open("mergeStats.log");
+
+        Debug << "here343" << endl;
+
+        stats 
+                << "#Pass\n" << 0 << endl
+                //<< "#Merged\n" << mergeStats.merged << endl 
+                << "#ViewCells\n" << numViewCells << endl 
+        << "#RenderCostDecrease\n" << 0 << endl // TODO
+                << "#TotalRenderCost\n" << totalRenderCost << endl
+                << "#CurrentPvs\n" << mRoot->GetPvs().GetSize() << endl
+                << "#ExpectedCost\n" << expectedCost << endl
+                << "#AvgRenderCost\n" << avgRenderCost << endl
+                << "#Deviation\n" << deviation << endl
+                << "#TotalPvs\n" << totalPvs << endl
+                << "#PvsSizeDecrease\n" << 0 << endl // TODO
+                << "#Volume\n" << mRoot->GetVolume() << endl
+                << endl;
+
+
+        while (!tqueue.empty())
+        {
+                ViewCell *vc = tqueue.top();
+                tqueue.pop();
+
+                if (!vc->IsLeaf()) 
+                {       
+                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        
+                        const int parentPvs = interior->GetPvs().GetSize();
+                        const float parentCost = (float)parentPvs * interior->GetVolume();
+                        float childCost = 0;
+                        int childPvs = 0;
+
+                        -- numViewCells;
+
+                        ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
+
+                        for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                        {
+                                childCost += (float)(*it)->GetPvs().GetSize() * (*it)->GetVolume();
+                                childPvs += (*it)->GetPvs().GetSize();
+
+                                tqueue.push(*it);
+                                ++ numViewCells;
+                        }
+
+                
+                        const float costDecr = (parentCost - childCost) / vol;
+
+                        totalRenderCost -= costDecr;
+                        totalPvs += childPvs - parentPvs;
+                        
+                        expectedCost = totalRenderCost / (float)numViewCells;
+                        avgRenderCost = (float)totalPvs / (float)numViewCells;
+
+                        stats 
+                                << "#Pass\n" << 0 << endl
+                                //<< "#Merged\n" << mergeStats.merged << endl 
+                                << "#ViewCells\n" << numViewCells << endl 
+                                << "#RenderCostDecrease\n" << costDecr << endl // TODO
+                                << "#TotalRenderCost\n" << totalRenderCost << endl
+                                << "#CurrentPvs\n" << vc->GetPvs().GetSize() << endl
+                                << "#ExpectedCost\n" << expectedCost << endl
+                                << "#AvgRenderCost\n" << avgRenderCost << endl
+                                << "#Deviation\n" << deviation << endl
+                                << "#TotalPvs\n" << totalPvs << endl
+                                << "#PvsSizeDecrease\n" << childPvs - parentPvs << endl // TODO
+                                << "#Volume\n" << vc->GetVolume() << endl
+                                << endl;
+
+                }
+        }
+
+        stats.close();
+}
+
+
+/*float ViewCellsTree::ComputeVolume(ViewCell *vc)
+{
+        if (vc->IsLeaf())
+        {
+                return vc->GetVolume();
+        }
+        else
+        {
+                ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+
+                ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
+
+                float volume = 0;
+
+                for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                {
+                        volume += ComputeVolume(*it);   
+                }
+
+                interior->SetVolume(volume);
+                return volume;
+        }
+}*/
+
+
+void ViewCellsTree::SetRoot(ViewCell *root)
+{
+        mRoot = root;
+}
+
 void ViewCellsTree::CollectBestViewCellSet(ViewCellContainer &viewCells, 
                                                                                    const int numViewCells)
@@ -1311 +1386 @@
         {
                 ViewCell *vc = tqueue.top();
-                
+                tqueue.pop();
+
                 // 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
-                if (vc->IsLeaf() || ((viewCells.size() + tqueue.size()) >= numViewCells))
+                if (vc->IsLeaf() || ((viewCells.size() + tqueue.size() + 1) >= numViewCells))
                 {
                         // todo: should be done with a function taking the active flag and some 
@@ -1333 +1409 @@
                         }
                 }
-
-                tqueue.pop();
         }
 }
@@ -1411 +1485 @@
 
 
-void ViewCellsTree::ExportStats()
-{
-
-}
-
 void ViewCellsTree::GetPvs(ViewCell *vc, ObjectPvs &pvs) const
 {
@@ -1562 +1631 @@
 
 
-void
-ViewCellsTree::AssignRandomColors()
+void ViewCellsTree::AssignRandomColors()
 {
   TraversalQueue tqueue;
@@ -1571 +1639 @@
         {
           ViewCell *vc = tqueue.top();
-          
+          tqueue.pop();
+
           // 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
@@ -1593 +1662 @@
                 
           }
-          
-          tqueue.pop();
+         
         }
 }
@@ -1606 +1674 @@
   while (!tqueue.empty()) {
         ViewCell *vc = tqueue.top();
-        
+        tqueue.pop();
         // 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
@@ -1620 +1688 @@
           
         }
-        
-        tqueue.pop();
   }
 }