[Boost-commit] svn:boost r83974 - trunk/boost/geometry/index/detail/rtree/visitors

Subject: [Boost-commit] svn:boost r83974 - trunk/boost/geometry/index/detail/rtree/visitors
From: adam.wulkiewicz_at_[hidden]
Date: 2013-04-19 21:21:21

Author: awulkiew
Date: 2013-04-19 21:21:20 EDT (Fri, 19 Apr 2013)
New Revision: 83974
URL: http://svn.boost.org/trac/boost/changeset/83974

Log:
geometry.index.rtree: removed unneeded prune_nodes() method from nearest query visitor.
Text files modified: 
   trunk/boost/geometry/index/detail/rtree/visitors/nearest_query.hpp |    35 +++++++++++------------------------     
   1 files changed, 11 insertions(+), 24 deletions(-)

Modified: trunk/boost/geometry/index/detail/rtree/visitors/nearest_query.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/visitors/nearest_query.hpp	(original)
+++ trunk/boost/geometry/index/detail/rtree/visitors/nearest_query.hpp	2013-04-19 21:21:20 EDT (Fri, 19 Apr 2013)
@@ -195,10 +195,12 @@
         typedef typename rtree::elements_type<internal_node>::type elements_type;
 
         // array of active nodes
-        typename index::detail::rtree::container_from_elements_type<
+        typedef typename index::detail::rtree::container_from_elements_type<
             elements_type,
             std::pair<node_distances_type, typename Allocators::node_pointer>
-        >::type active_branch_list;
+        >::type active_branch_list_type;
+
+        active_branch_list_type active_branch_list;
         active_branch_list.reserve(m_parameters.get_max_elements());
         
         elements_type const& elements = rtree::elements(n);
@@ -242,15 +244,15 @@
         std::sort(active_branch_list.begin(), active_branch_list.end(), abl_less);
 
         // recursively visit nodes
-        for ( size_t i = 0 ;; ++i )
+        for ( typename active_branch_list_type::const_iterator it = active_branch_list.begin();
+              it != active_branch_list.end() ; ++it )
         {
-            // prune nodes
-            prune_nodes(active_branch_list);
-
-            if ( active_branch_list.size() <= i )
+            // if current node is further than furthest neighbor, the rest of nodes also will be further
+            if ( m_result.has_enough_neighbors() &&
+                 is_node_prunable(m_result.greatest_comparable_distance(), it->first) )
                 break;
 
-            rtree::apply_visitor(*this, *active_branch_list[i].second);
+            rtree::apply_visitor(*this, *(it->second));
         }
     }
 
@@ -291,21 +293,6 @@
     }
 
 private:
-    template <typename ActiveBranchList>
-    inline void prune_nodes(ActiveBranchList & abl) const
-    {
-        // if some value were found
-        if ( m_result.has_enough_neighbors() )
-        {
-            // prune if box's mindist is further than value's mindist
-            while ( !abl.empty() &&
-                    is_node_prunable(m_result.greatest_comparable_distance(), abl.back().first) )
-            {
-                abl.pop_back();
-            }
-        }
-    }
-
     static inline bool abl_less(
         std::pair<node_distances_type, typename Allocators::node_pointer> const& p1,
         std::pair<node_distances_type, typename Allocators::node_pointer> const& p2)
@@ -433,7 +420,7 @@
                 active_branch_list.pop_front();
                 rtree::apply_visitor(*this, *(active_branch.second));
 
-                // if some values were found
+                // remove further nodes
                 BOOST_ASSERT_MSG(neighbors.size() <= max_count(), "unexpected neighbours count");
                 if ( max_count() <= neighbors.size() )
                 {