Changeset 978 for GTP/trunk

Timestamp:

05/23/06 09:33:03 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/generate_viewcells.env (modified) (1 diff)
• src/VspBspTree.cpp (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/generate_viewcells.env

@@ -262 +262 @@
 #       filename ../scripts/viewcells_vienna.xml
 #       filename D:/svn/gametools/GTP/trunk/Lib/Vis/Preprocessing/scripts/vienna-visibility.xml
-        filename D:/svn/gametools/GTP/trunk/Lib/Vis/Preprocessing/scripts/vienna-visibility.xml.zip
+        filename E:/svn/gametools/GTP/trunk/Lib/Vis/Preprocessing/scripts/vienna-visibility.xml.zip
 }
 

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

@@ -1453 +1453 @@
                 bestAxis = -1;
 
-        // mximum cost ratio for axis to be valid:
+#if 0
+        // maximum cost ratio for axis to be valid:
         // if exceeded, spatial mid split is used instead
-        //const maxCostRatioForHeur = 0.99f;
-
-
+        const maxCostRatioForHeur = 0.99f;
+#endif
+
+        // if we use some kind of specialised fixed axis
     const bool useSpecialAxis = 
                 mOnlyDrivingAxis || mUseRandomAxis || mCirculatingAxis;
 
-
-        // use some kind of specialised fixed axis
         if (mUseRandomAxis)
                 sAxis = Random(3);
@@ -1543 +1543 @@
                         }
                                                 
-
-                        if (!mUseDrivingAxisForMaxCost)
+                        
+                        if (mUseDrivingAxisForMaxCost)
+                        {
+                                // we take longest axis split if cost ratio exceeds threshold
+                                if (nCostRatio[axis] < min(maxCostRatioForArbitraryAxis, nCostRatio[bestAxis]))
+                                {
+                                        bestAxis = axis;
+                                }
+                                else if (nCostRatio[axis] < nCostRatio[bestAxis])
+                                        Debug << "taking split along longest axis (" << bestAxis << ") instead of  (" << axis << ")" << endl;
+                                
+                        }
+                        else
                         {
                                 if (bestAxis == -1)
@@ -1554 +1565 @@
                                         bestAxis = axis;
                                 }
-                        }
-                        else 
-                        {
-                                 // NOTE: takes longest axis split if cost ratio exceeds threshold
-                                if (nCostRatio[axis] < min(maxCostRatioForArbitraryAxis, nCostRatio[bestAxis]))
-                                {
-                                        bestAxis = axis;
-                                }
-                                else if (nCostRatio[axis] < nCostRatio[bestAxis])
-                                        Debug << "taking split along longest axis (" << bestAxis << ") instead of  (" << axis << ")" << endl;
-                                
-                        }
+                        } 
                 }
         }