Changeset 1893 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

12/14/06 09:16:08 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (5 diffs)

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

@@ -827 +827 @@
                 const int maxCostMisses = splitCandidate.mParentData.mMaxCostMisses;
                 // max cost threshold violated?
-                splitCandidate.SetMaxCostMisses(maxCostRatioViolated  ? maxCostMisses + 1: maxCostMisses);
+                splitCandidate.SetMaxCostMisses(maxCostRatioViolated ? 
+                                                                                maxCostMisses + 1: maxCostMisses);
         }
         
@@ -848 +849 @@
         const float factor = mRenderCostDecreaseWeight;
 
-        float priority;
-
-        if (1)
-        {
-                priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-                if (mHierarchyManager->mConsiderMemory)
-                {
-                        priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mMemoryConst);
-                }
-        }
-        else
-        {
-                if (!mHierarchyManager->mConsiderMemory)
-                {
-                        priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-                }
-                else
-                {
-                        const float ratio = 
-                                renderCostDecr / ((float)splitCandidate.GetPvsEntriesIncr() + mMemoryConst);
-
-                        priority = factor * ratio + (1.0f - factor) * oldRenderCost;
-                }
+        float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+
+        if (mHierarchyManager->mConsiderMemory)
+        {
+                priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mMemoryConst);
+        }
+
+        /////////////
+        // avg ray contri
+
+        const float avgRayContri = splitCandidate.mParentData.GetAvgRayContribution();
+        cout << "vsp avgRayContri: " << avgRayContri << endl;
+
+        // avg ray contri very high. i.e., the result is influenced by undersampling
+        // => decrease priority
+        if (avgRayContri > 99925)
+        {
+                priority /= avgRayContri;
         }
 
@@ -1869 +1865 @@
         VspLeaf *leaf = dynamic_cast<VspLeaf *>(data.mNode);
 
-
         if (data.mPvs > mVspStats.maxPvs)
         {
@@ -1885 +1880 @@
         {
         ++ mVspStats.maxDepthNodes;
-                //Debug << "new max depth: " << mVspStats.maxDepthNodes << endl;
         }
 
@@ -1908 +1902 @@
         ++ mCreatedViewCells;
 
-#ifdef GTPGTP_DEBUG
+#ifdef GTP_DEBUG
         Debug << "BSP stats: "
                   << "Depth: " << data.mDepth << " (max: " << mTermMaxDepth << "), "