Changeset 837 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp

Timestamp:

04/27/06 09:29:52 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -1247 +1247 @@
         
         // the relative cost ratio
-        float ratio = /*Limits::Infinity;*/99999999.0;
+        float ratio = /*Limits::Infinity;*/99999999.0f;
         bool splitPlaneFound = false;
 
@@ -1430 +1430 @@
         int bestAxis;
 
+        // if max cost ratio is exceeded, take split along longest axis instead
+        const float maxCostRatioForArbitraryAxis = 0.9f;
+
         if (mUseDrivingAxisForMaxCost)
                 bestAxis = box.Size().DrivingAxis();
@@ -1437 +1440 @@
         // mximum cost ratio for axis to be valid:
         // if exceeded, spatial mid split is used instead
-        const float maxCostRatio = 0.9f;
-
-        // hack : subdivide along driving axis up to certain depth
-        int maxDepthForDrivingAxis = 0;
-        const maxCostRatioForHeur = 0.99;
-
-    const bool useSpecialAxis = mOnlyDrivingAxis || mUseRandomAxis || 
-                mCirculatingAxis;
+        //const maxCostRatioForHeur = 0.99f;
+
+
+    const bool useSpecialAxis = 
+                mOnlyDrivingAxis || mUseRandomAxis || mCirculatingAxis;
 
 
@@ -1476 +1476 @@
                         
                         //-- split plane position is spatial median
-                        //-- use median split if cost ratio very low as
-                        //-- there are not enough visibility cues
-
-                        else //if (!mUseCostHeuristics || (nCostRatio[axis] > maxCostRatioForHeur))
+
+
+                        // also use median split if cost ratio very low as
+                        // there are not enough visibility cues
+                        //if (!mUseCostHeuristics || (nCostRatio[axis] > maxCostRatioForHeur))
+                        else 
                         {
 
@@ -1541 +1543 @@
                         {
                                  // NOTE: takes longest axis split if cost ratio exceeds threshold
-                                if (nCostRatio[axis] < min(maxCostRatio, nCostRatio[bestAxis]))
+                                if (nCostRatio[axis] < min(maxCostRatioForArbitraryAxis, nCostRatio[bestAxis]))
                                 {
                                         bestAxis = axis;
                                 }
-                                //else if (nCostRatio[axis] < nCostRatio[bestAxis])
-                                //      Debug << "warning!! different path taken: " << axis << " " << bestAxis << endl;
+                                else if (nCostRatio[axis] < nCostRatio[bestAxis])
+                                        Debug << "taking split along longest axis (" << bestAxis << ") instead of  (" << axis << ")" << endl;
                                 
                         }