[MOAB-dev] r4978 - in MOAB/trunk/src: . moab

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-06-09 11:20:36 -0500 (Thu, 09 Jun 2011)
New Revision: 4978

Modified:
   MOAB/trunk/src/OrientedBoxTreeTool.cpp
   MOAB/trunk/src/moab/OrientedBoxTreeTool.hpp
Log:
back out accidental checkin

Modified: MOAB/trunk/src/OrientedBoxTreeTool.cpp
===================================================================
--- MOAB/trunk/src/OrientedBoxTreeTool.cpp	2011-06-09 16:13:35 UTC (rev 4977)
+++ MOAB/trunk/src/OrientedBoxTreeTool.cpp	2011-06-09 16:20:36 UTC (rev 4978)
@@ -32,7 +32,6 @@
 #include <limits>
 #include <assert.h>
 #include <math.h>
-#include <float.h>
 
 //#define MB_OBB_USE_VECTOR_QUERIES
 //#define MB_OBB_USE_TYPE_QUERIES
@@ -219,8 +218,6 @@
     max_depth( 0 ),
     worst_split_ratio( 0.95 ),
     best_split_ratio( 0.4 ),
-    always_use_element_side_splits(false),
-    num_element_for_side_splits(5),
     set_options( MESHSET_SET )
   {}
 
@@ -231,7 +228,6 @@
       && worst_split_ratio <= 1.0
       && best_split_ratio >= 0.0
       && worst_split_ratio >= best_split_ratio
-      && num_element_for_side_splits > 0
       ;
 }
 
@@ -338,16 +334,16 @@
  *\param num_intersecting Output, number entities intersecting plane
  */
 static ErrorCode split_box( Interface* instance, 
-                            const CartVect& normal,
-                            const CartVect& point,
-                            const Range& entities, 
-                            Range& left_list, 
-                            Range& right_list )
+                              const OrientedBox& box, 
+                              int axis, 
+                              const Range& entities, 
+                              Range& left_list, 
+                              Range& right_list )
 {
   ErrorCode rval;
   left_list.clear();
   right_list.clear();
-  
+
   std::vector<CartVect> coords;
   for (Range::reverse_iterator i = entities.rbegin(); i != entities.rend(); ++i) {