boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-10 11:32:15 +00:00
Code Issues Projects Releases Wiki Activity

geometry.index rtree: error fixed in linear redistribute_elements, errors fixed in experimental spatial query iterator and visitor.

Browse Source 
[SVN r83945]
This commit is contained in:
Adam Wulkiewicz
2013-04-18 00:06:35 +00:00
parent dda8d2ac57
commit 8d002db8a9
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp
View File

@@ -293,8 +293,9 @@ struct redistribute_elements<Value, Options, Translator, Box, Allocators, linear
// choose group which box content have to be enlarged least or has smaller content or has fewer elements
if ( content_increase1 < content_increase2 ||
( content_increase1 == content_increase2 && content1 < content2 ) ||
( content1 == content2 && elements1.size() <= elements2.size() ) )
( content_increase1 == content_increase2 &&
( content1 < content2 ||
( content1 == content2 && elements1.size() <= elements2.size() ) ) ) )
{
elements1.push_back(elem); // MAY THROW, STRONG (copy)
box1 = enlarged_box1;

24
include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp
View File

@@ -121,14 +121,17 @@ struct spatial_query_incremental
void increment()
{
if ( values )
++value_index;
for (;;)
{
// if leaf is choosen, move to the next value in leaf
if ( values )
{
// ERROR: infinite loop - value_index isn't incremented
for ( ;; ++value_index )
{
// no more values, clear current leaf
if ( values->size() <= value_index )
{
values = 0;
@@ -136,6 +139,7 @@ struct spatial_query_incremental
break;
}
// return if next value is found
Value const& v = (*values)[value_index];
if ( index::detail::predicates_check<index::detail::value_tag, 0, predicates_len>(pred, v, tr(v)) )
return;
@@ -143,19 +147,25 @@ struct spatial_query_incremental
}
// move to the next leaf if values aren't set
for ( ; !values ; ++internal_stack.back().first )
while ( !values )
{
// return if there is no more nodes to traverse
if ( internal_stack.empty() )
return;
// no more children in current node, remove it from stack
if ( internal_stack.back().first == internal_stack.back().second )
{
internal_stack.pop_back();
continue;
}
if ( index::detail::predicates_check<index::detail::bounds_tag, 0, predicates_len>(pred, 0, internal_stack.back().first->first) )
rtree::apply_visitor(*this, *(internal_stack.back().first->second));
internal_iterator it = internal_stack.back().first;
++internal_stack.back().first;
// next node is found, push it to the stack
if ( index::detail::predicates_check<index::detail::bounds_tag, 0, predicates_len>(pred, 0, it->first) )
rtree::apply_visitor(*this, *(it->second));
}
}
}
@@ -181,16 +191,14 @@ class spatial_query_iterator
typedef visitors::spatial_query_incremental<Value, Options, Translator, Box, Allocators, Predicates> visitor_type;
typedef typename visitor_type::node_pointer node_pointer;
// WARNING! If const Value is passed to rebind it won't compile for interprocess' allocator
typedef typename Allocators::allocator_type::template rebind<Value>::other allocator_type;
public:
typedef std::input_iterator_tag iterator_category;
typedef const Value value_type;
typedef Value const& reference;
typedef typename allocator_type::difference_type difference_type;
typedef typename allocator_type::pointer pointer;
typedef typename allocator_type::const_pointer pointer;
inline spatial_query_iterator(Translator const& t, Predicates const& p)
: m_visitor(t, p)