[MOAB-dev] r5667 - in MOAB/trunk: src/moab/point_locater tools

[rhl6856 at mcs.anl.gov]

Author: rhl6856
Date: 2012-08-03 13:37:24 -0500 (Fri, 03 Aug 2012)
New Revision: 5667

Modified:
   MOAB/trunk/src/moab/point_locater/bvh_tree.hpp
   MOAB/trunk/src/moab/point_locater/common_tree.hpp
   MOAB/trunk/src/moab/point_locater/element_tree.hpp
   MOAB/trunk/tools/point_search.cpp
Log:
both trees compiling. plan to rewrite element_tree logic

Modified: MOAB/trunk/src/moab/point_locater/bvh_tree.hpp
===================================================================
--- MOAB/trunk/src/moab/point_locater/bvh_tree.hpp	2012-08-03 18:37:23 UTC (rev 5666)
+++ MOAB/trunk/src/moab/point_locater/bvh_tree.hpp	2012-08-03 18:37:24 UTC (rev 5667)
@@ -27,14 +27,28 @@
 //forward declarations
 template< typename _Entity_handles, 
 	  typename _Box, 
-	  typename _Moab> class Bvh_tree;
+	  typename _Moab,
+	  typename _Parametrizer> class Bvh_tree;
 
 //non-exported functionality
 namespace {
+	namespace _bvh {
+	template< typename Box, typename Entity_handle>
+	struct _Node{
+		unsigned int dim;
+		unsigned int child;
+		float Lmax, Rmin;
+		std::vector< std::pair< Box, Entity_handle> > entities;
+	}; // _Node
 
+	struct _Split_data {
+	
+	}; //_Split_data
+
+
+	} // namespace _bvh
 } //private namespace
 
-
 template< typename _Entity_handles,
 	  typename _Box,
 	  typename _Moab,
@@ -55,6 +69,8 @@
 			      _Moab,
 			      _Parametrizer> Self;
 	typedef typename std::pair< Box, Entity_handle> Leaf_element;
+	typedef _bvh::_Node< Box, Entity_handle> Node;
+	typedef typename std::vector< Node> Nodes;
 //public methods
 public:
 //Constructor
@@ -67,23 +83,28 @@
 				entity_contains( entity_contains){
 	typedef typename Entity_handles::iterator Entity_handle_iterator;
 	typedef typename std::map< Entity_handle, Box> Entity_map;
+	typedef typename Entity_map::iterator Entity_map_iterator;
+	typedef std::vector< Entity_map_iterator> Vector;
 	//a fully balanced tree will have 2*_entities.size()