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

[rhl6856 at mcs.anl.gov]

Author: rhl6856
Date: 2012-08-29 15:18:15 -0500 (Wed, 29 Aug 2012)
New Revision: 5720

Modified:
   MOAB/trunk/src/moab/point_locater/point_locater.hpp
   MOAB/trunk/src/moab/point_locater/tree/bvh_tree.hpp
   MOAB/trunk/src/moab/point_locater/tree/element_tree.hpp
   MOAB/trunk/tools/point_search.cpp
Log:
now exporting natural parameters

Modified: MOAB/trunk/src/moab/point_locater/point_locater.hpp
===================================================================
--- MOAB/trunk/src/moab/point_locater/point_locater.hpp	2012-08-29 19:39:08 UTC (rev 5719)
+++ MOAB/trunk/src/moab/point_locater/point_locater.hpp	2012-08-29 20:18:15 UTC (rev 5720)
@@ -46,6 +46,7 @@
 //private functionality
 private:
 
+//TODO: deprecate this
 template< typename Point_map, typename List>
 void resolve_boxes( const Point_map & query_points,  List & list){
        /*
@@ -103,12 +104,13 @@
 Error locate_points( const Points & query_points, 
 		     Entities & entities, double tol) const{
 	typedef typename Points::const_iterator Point_iterator;
-	typedef typename Entities::value_type Entity_handle;
+	typedef typename Entities::value_type  Result;
 	Entities result;
 	result.reserve( query_points.size());	
 	for(Point_iterator i = query_points.begin(); 
 			   i != query_points.end(); ++i){
-			const Entity_handle h = tree_.find( *i, tol);		
+			Result h;	
+			tree_.find( *i, tol, h);
 			result.push_back( h);
 	}
 	entities = result;
@@ -121,7 +123,7 @@
 	//TODO: this could be faster with caching, but of course this is 
 	//really just for testing
 	typedef typename Points::const_iterator Point_iterator;
-	typedef typename Entities::value_type Entity_handle;
+	typedef typename Entities::value_type::first_type Entity_handle;
 	Entities result;
 	result.reserve( query_points.size());	
 	std::size_t count = 0;
@@ -129,7 +131,7 @@
 	typename Entities::iterator j = entities.begin();
 	for( Point_iterator i = query_points.begin(); 
 			    i != query_points.end(); ++i, ++j){
-		if( *j == 0){
+		if( j->first == 0){
 			const Entity_handle h = tree_.bruteforce_find( *i, tol);
 			if( h == 0){
 				++count;

Modified: MOAB/trunk/src/moab/point_locater/tree/bvh_tree.hpp
===================================================================
--- MOAB/trunk/src/moab/point_locater/tree/bvh_tree.hpp	2012-08-29 19:39:08 UTC (rev 5719)
+++ MOAB/trunk/src/moab/point_locater/tree/bvh_tree.hpp	2012-08-29 20:18:15 UTC (rev 5720)