Changeset 1877 for GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.h

Timestamp:

12/11/06 08:31:01 (18 years ago)

Author:

bittner

Message:

sampling updates

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.h (modified) (4 diffs)

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

@@ -433 +433 @@
   RayInfoContainer rays;
   int mTotalRays;
-        
+  float mTotalContribution;
+  
   bool mValidPvs;
   
@@ -440 +441 @@
   RssTreeLeaf(RssTreeInterior *p,
                           const int nRays
-                          ):RssTreeNode(p), rays(), mPvsSize(0), mTotalRays(0), mValidPvs(false) {
+                          ):RssTreeNode(p), rays(), mPvsSize(0), mTotalRays(0),
+                                mTotalContribution(0.0f), mValidPvs(false) {
     rays.reserve(nRays);
   }
@@ -455 +457 @@
   
   void AddRay(const RayInfo &data) {
-                mValidPvs = false;
-    rays.push_back(data);
-                mTotalRays++;
-                data.mRay->Ref();
+        mValidPvs = false;
+        rays.push_back(data);
+        mTotalRays++;
+        mTotalContribution +=
+          ABS_CONTRIBUTION_WEIGHT*data.mRay->mPvsContribution +
+          (1.0f - ABS_CONTRIBUTION_WEIGHT)*data.mRay->mRelativePvsContribution;
+        data.mRay->Ref();
   }
         
@@ -1066 +1071 @@
 
   int
-  PruneRays(RssTreeLeaf *leaf,
-                        const float contributionThreshold);
-  int
   PruneRaysRandom(RssTreeLeaf *leaf,
                                   const float ratio);