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

Timestamp:

02/06/06 19:09:53 (18 years ago)

Author:

mattausch

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp

@@ -22 +22 @@
         bool operator() (T v1, T v2) const
         {
-                return (v1->GetTimeStamp() < v2->GetTimeStamp());
+                return (v1->GetMergeCost() < v2->GetMergeCost());
         }
 };
@@ -107 +107 @@
 mValid(true),
 mParent(NULL),
-mTimeStamp(0),
+mMergeCost(0),
 mIsActive(false)
 {
@@ -119 +119 @@
 mValid(true),
 mParent(NULL),
-mTimeStamp(0),
+mMergeCost(0),
 mIsActive(false)
 {
@@ -230 +230 @@
 
 
-void ViewCell::SetTimeStamp(const int timeStamp)
-{
-        mTimeStamp = timeStamp;
-}
-
-
-int ViewCell::GetTimeStamp() const
-{
-        return mTimeStamp;
+void ViewCell::SetMergeCost(const float mergeCost)
+{
+        mMergeCost = mergeCost;
+}
+
+
+float ViewCell::GetMergeCost() const
+{
+        return mMergeCost;
 }
 
@@ -445 +445 @@
         float variance = 0;
         int totalPvs = 0;
-        float totalCost = 0;
+        float totalRenderCost = 0;
 
         //-- compute statistics values of initial view cells
-        mViewCellsManager->EvaluateRenderStatistics(totalCost,
+        mViewCellsManager->EvaluateRenderStatistics(totalRenderCost,
                                                                                                 mExpectedCost,
                                                                                                 mDeviation,
@@ -471 +471 @@
         Debug << "deviation: " << mDeviation << endl;
         Debug << "avg render cost: " << mAvgRenderCost << endl;
-        Debug << "expected cost: " <<mExpectedCost << endl;
+        Debug << "expected cost: " << mExpectedCost << endl;
 
 
@@ -498 +498 @@
 
         // frequency stats are updated
-        const int statsOut = 100;
+        const int statsOut = 1;
 
         // passes are needed for statistics, because we don't want to record
@@ -521 +521 @@
 
         //-- use priority queue to merge leaf pairs
-
-        while (!mMergeQueue.empty())// && (realNumActiveViewCells > mMergeMinViewCells))
+// HACK
+        //const float maxAvgCost = 350;
+        while (!mMergeQueue.empty())//NumActiveViewCells > mMergeMinViewCells))
         {
                 //-- reset merge queue if the ratio of current expected cost / real expected cost
@@ -588 +589 @@
                 {
                         ViewCell::NewMail();
-                                                
+
+                        //-- update statistical values
                         -- realNumActiveViewCells;
                         ++ mergeStats.merged;
                         ++ mergedPerPass;
 
-
-                        //-- update statistical values
+                        const float renderCostIncr = mc.GetRenderCost();
+                        const float mergeCostIncr = mc.GetMergeCost();
+
+                        totalRenderCost += renderCostIncr;
+                        mDeviation += mc.GetDeviationIncr();
+                        
+                        
+                        // merge the view cells of leaf1 and leaf2
+                        int pvsDiff;
+                        ViewCellInterior *mergedVc = 
+                                MergeViewCells(mc.mLeftViewCell, mc.mRightViewCell, pvsDiff);
+
 
                         // total render cost and deviation has changed
@@ -600 +612 @@
                         // cost heuristics, but cannot recompute costs on each increase of the 
                         // expected cost
-
-                        totalCost += mc.GetRenderCost();
-                        mDeviation += mc.GetDeviationIncr();
-                                                
-                        realExpectedCost = totalCost / (float)realNumActiveViewCells;
-                        
-                        const float currentMergeCost = mc.GetMergeCost();
-
-                        // merge the view cells of leaf1 and leaf2
-                        int pvsDiff;
-                        ViewCellInterior *mergedVc = 
-                                MergeViewCells(mc.mLeftViewCell, mc.mRightViewCell, pvsDiff);
-
                         totalPvs += pvsDiff;
-
-                        // set timestamp
-                        mergedVc->SetTimeStamp(mergeStats.merged);
-
+                        realExpectedCost = totalRenderCost / (float)realNumActiveViewCells;
                         realAvgRenderCost = (float)totalPvs / (float)realNumActiveViewCells;
+        
+                        // set merge cost to this node
+                        mergedVc->SetMergeCost(totalRenderCost);
+
 #if VC_HISTORY
                         if (mc.mLeftViewCell->IsSibling(mc.mRightViewCell))
@@ -632 +632 @@
                                         << "#Merged\n" << mergeStats.merged << endl 
                                         << "#Viewcells\n" << realNumActiveViewCells << endl 
-                                        << "#CurrentCost\n" << currentMergeCost << endl
-                                        << "#RelativeCost\n" << currentMergeCost / mOverallCost << endl
-                                        << "#CurrentPvs\n" << mc.GetLeftViewCell()->GetPvs().GetSize() << endl
-                                        << "#MergedSiblings\n" << mergeStats.siblings << endl
-                                        << "#AvgTreeDist\n" << mergeStats.AvgTreeDist() << endl
-                                        << "#UsedExpectedCost\n" << mExpectedCost << endl
-                                        << "#RealExpectedCost\n" << realExpectedCost << endl
-                                        << "#RealAvgRenderCost\n" << realAvgRenderCost << endl
-                                        << "#AvgRenderCost\n" << mAvgRenderCost << endl
-                                        << "#expectedCostRatio\n" << mExpectedCost / realExpectedCost << endl
-                                        << "#Deviation\n" << mDeviation / (float)realNumActiveViewCells << endl
-                                        << "#TotalDeviation\n" << mDeviation<< 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;
                         }
                 }
@@ -682 +678 @@
                 }*/
                 ViewCellInterior *root = mViewCellsManager->MergeViewCells(activeViewCells);
-
-                root->SetTimeStamp(mergeStats.merged + 1);
+                root->SetMergeCost(totalRenderCost);
                 mRoot = root;
         }
@@ -692 +687 @@
         }
 
+
+        while (!mMergeQueue.empty())
+        {
+                mMergeQueue.pop();
+        }
+        
+        
         // TODO delete because makes no sense here
         mergeStats.expectedRenderCost = realExpectedCost;