Changeset 1900 for GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.cpp

Timestamp:

12/15/06 23:40:27 (18 years ago)

Author:

bittner

Message:

experiments with different contribution computations

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.cpp (modified) (11 diffs)

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

@@ -365 +365 @@
         
           RssTreeNode::RayInfo info(*ri);
-          
+          if (!EpsilonEqualV3(info.GetOrigin(), info.GetTermination(), Limits::Small)) {
+
           // first construct a leaf that will get subdivide
           RssTreeLeaf *leaf = (RssTreeLeaf *) GetRoot(info.GetSourceObject());
+          
 
           leaf->AddRay(info);
@@ -389 +391 @@
           leaf->dirBBox.Include(dVec);
           dirBBox.Include(dVec);
+          }
   }
 
@@ -1456 +1459 @@
   if (stat.rayRefs > mMaxRays) {
         Debug<<"Prunning rays..."<<endl<<flush;
-        PruneRays(mMaxRays);
+        PruneRays(0.8f*mMaxRays);
         Debug<<"done."<<endl<<flush;
         //      UpdateTreeStatistics();
   }
-
 }
 
@@ -1553 +1555 @@
 RssTree::AddRay(RssTreeNode::RayInfo &info)
 {
+  if (EpsilonEqualV3(info.GetOrigin(), info.GetTermination(), Limits::Small))
+        return;
 
   stack<RayTraversalData> tstack;
@@ -1561 +1565 @@
   RayTraversalData data;
   
+
   while (!tstack.empty()) {
     data = tstack.top();
@@ -1807 +1812 @@
 RssTree::UpdateTreeStatistics()
 {
+  for (int i=0; i < mRoots.size(); i++)
+        UpdateImportance(mRoots[i]);
+  
+#if 0  
   stack<RssTreeNode *> tstack;
         
@@ -1819 +1828 @@
   int leaves = 0;
 
-  for (int i=0; i < mRoots.size(); i++)
-        UpdateImportance(mRoots[i]);
 
   PushRoots(tstack);
-
+  
   while (!tstack.empty()) {
     RssTreeNode *node = tstack.top();
@@ -1871 +1878 @@
   stat.avgWeightedRayContribution = sumWeightedRayContribution/(float)sumRays;
   stat.rayRefs = (int)sumRays;
+#endif
   
 }
@@ -2822 +2830 @@
           float c1 = weight*ray->mPvsContribution;
           float c2 = weight*ray->mRelativePvsContribution;
+
           sumContributions += c1;
           if (c1 > maxContribution)
@@ -2832 +2841 @@
           sumRelContributions += c2;
           if (c2 > maxRelContribution)
-                        maxRelContribution = c2;
-
+                maxRelContribution = c2;
+          
           //sumWeights += weight;
           sumWeights += 1.0f;
@@ -2864 +2873 @@
           leaf->mImportance =
                 pow(((weightAbsContributions*sumContributions +
-                          (1.0f - weightAbsContributions)*sumRelContributions)/sumWeights), 3);
-#else 
+                          (1.0f - weightAbsContributions)*sumRelContributions)/sumWeights), 1.0f);
+#else 1
           leaf->mImportance =
                 (weightAbsContributions*maxContribution +