Changeset 605 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp

Timestamp:

02/08/06 15:05:04 (18 years ago)

Author:

mattausch

Message:

 

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp (modified) (9 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp

@@ -160 +160 @@
 
 
-void ViewCell::UpdateViewCellsStats(ViewCellsStatistics &vcStat)
-{
-        ++ vcStat.viewCells;
-                
-        const int pvsSize = mPvs.GetSize();
-
-        vcStat.pvs += pvsSize;
-
-        if (pvsSize == 0)
-                ++ vcStat.emptyPvs;
-
-        if (pvsSize > vcStat.maxPvs)
-                vcStat.maxPvs = pvsSize;
-
-        if (pvsSize < vcStat.minPvs)
-                vcStat.minPvs = pvsSize;
-
-        if (!mValid)
-                ++ vcStat.invalid;
-}
-
-
 float ViewCell::GetArea() const
 {
@@ -477 +455 @@
         mViewCellsManager->GetPvsStatistics(pvsStats);
 
-        static float expectedValue = pvsStats.avgPvs;
+        //static float expectedValue = pvsStats.avgPvs;
         
         // the current view cells are kept in this container
@@ -521 +499 @@
 
         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\n" << 0 << endl
-                << "#Volume\n" << 0 << endl
-                << "#Dummy\n" << 0 << 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\n" << 0 << endl
+                   << "#Volume\n" << endl;
 
         //-- use priority queue to merge leaf pairs
@@ -584 +561 @@
                 }
 
-#ifdef _DEBUG
-                Debug << "abs mergecost: " << mMergeQueue.top().GetMergeCost() << 
-                          << " rel mergecost: " << mMergeQueue.top().GetRenderCost() / mExpectedCost << 
-                          << " max ratio: " << mMergeMaxCostRatio << endl
-                          << " expected value: " << realExpectedCost << endl;
-#endif
 
         
@@ -637 +608 @@
                                 ++ mergeStats.siblings;
 #endif
-                //      if (((mergeStats.merged % statsOut) == 0) || 
-                //              (realNumActiveViewCells == mMergeMinViewCells))
-                //      {
+                        if (((mergeStats.merged % statsOut) == 0) || 
+                        (realNumActiveViewCells == mMergeMinViewCells))
+                        {
                                 cout << "merged " << mergeStats.merged << " view cells" << endl;
 
@@ -646 +617 @@
                                         << "#Merged\n" << mergeStats.merged << endl 
                                         << "#Viewcells\n" << realNumActiveViewCells << endl 
-                                        << "#RenderCostIncrease\n" << renderCostIncr << endl
+                    << "#RenderCostIncrease\n" << renderCostIncr << endl
                                         << "#TotalRenderCost\n" << totalRenderCost << endl
                                         << "#CurrentPvs\n" << mergedVc->GetPvs().GetSize() << endl
-                                        << "#ExpectedCost\n" << realExpectedCost / (float) realNumActiveViewCells << 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
-                                        << "#Dummy\n" << (float)mergedVc->GetPvs().GetSize() * mergedVc->GetVolume() / mViewCellsManager->GetViewSpaceBox().GetVolume() << endl;
-                //      }
+                                        << "#Volume\n" << mergedVc->GetVolume() << endl;
+                        }
                 }
                 else
@@ -1489 +1459 @@
         tstack.push(vc);
 
-        Debug << "current size: " << pvsSize << endl;
-
         while (!tstack.empty())
         {
@@ -1563 +1531 @@
         return vc;
 }
+
+
+
+void  ViewCellsTree::UpdateViewCellsStats(ViewCell *vc, ViewCellsStatistics &vcStat)
+{
+        ++ vcStat.viewCells;
+                
+        const int pvsSize = GetPvsSize(vc);
+
+        vcStat.pvs += pvsSize;
+
+        if (pvsSize == 0)
+                ++ vcStat.emptyPvs;
+
+        if (pvsSize > vcStat.maxPvs)
+                vcStat.maxPvs = pvsSize;
+
+        if (pvsSize < vcStat.minPvs)
+                vcStat.minPvs = pvsSize;
+
+        if (!vc->GetValid())
+                ++ vcStat.invalid;
+}
+
 
 
@@ -1643 +1635 @@
 
 
+
 /************************************************************************/
 /*                    MergeStatistics implementation                    */