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

Timestamp:

10/23/06 20:24:14 (18 years ago)

Author:

mattausch

Message:

updated priority meaurement: taking total cost and memory into account

File:

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

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

@@ -786 +786 @@
 
 
-void VspTree::EvalSubdivisionCandidate(VspSubdivisionCandidate &splitCandidate)
-{
-        float frontProb;
-        float backProb;
+void VspTree::EvalSubdivisionCandidate(VspSubdivisionCandidate &splitCandidate, bool computeSplitPlane)
+{
+        if (computeSplitPlane)
+        {
+                float frontProb;
+                float backProb;
+
+                // compute locally best split plane
+                const float ratio = SelectSplitPlane(splitCandidate.mParentData, 
+                                                                                         splitCandidate.mSplitPlane, 
+                                                                                         frontProb, 
+                                                                                         backProb);
+        
+                const bool maxCostRatioViolated = mTermMaxCostRatio < ratio;
+
+                const int maxCostMisses = splitCandidate.mParentData.mMaxCostMisses;
+                // max cost threshold violated?
+                splitCandidate.SetMaxCostMisses(maxCostRatioViolated  ? maxCostMisses + 1: maxCostMisses);
+        }
         
         VspLeaf *leaf = dynamic_cast<VspLeaf *>(splitCandidate.mParentData.mNode);
         
-        // compute locally best split plane
-        const float ratio = SelectSplitPlane(splitCandidate.mParentData, 
-                                                                                 splitCandidate.mSplitPlane, 
-                                                                                 frontProb, 
-                                                                                 backProb);
-
-        const bool maxCostRatioViolated = mTermMaxCostRatio < ratio;
-
-        // max cost threshold violated?
-        splitCandidate.SetMaxCostMisses(maxCostRatioViolated  ? 
-                        splitCandidate.mParentData.mMaxCostMisses + 1:
-                        splitCandidate.mParentData.mMaxCostMisses);
-
         // compute global decrease in render cost
         float oldRenderCost;
@@ -821 +823 @@
         // otherwise danger of being stuck in a local minimum!!
         const float factor = mRenderCostDecreaseWeight;
-
         float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
 
-        if (mHierarchyManager->mConsiderMemory)
-        {
-                //cout << "here4 rc: " << factor * renderCostDecr << " pvs: " << (1.0f - factor) * splitCandidate.GetPvsEntriesIncr() << endl;
-                //const float priority = factor * renderCostDecr - (1.0f - factor) * splitCandidate.GetPvsEntriesIncr();
+        if (1)//0 && mHierarchyManager->mConsiderMemory)
+        {
                 priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mHierarchyManager->mMemoryConst);
         }
@@ -835 +834 @@
 
 
-float VspTree::EvalPriority(const VspSubdivisionCandidate &splitCandidate) const
+/*float VspTree::EvalPriority(const VspSubdivisionCandidate &splitCandidate) const
 {
         // compute global decrease in render cost
@@ -857 +856 @@
 
         return priority;
-}
+}*/