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

node split algorithm separated from insert visitor, it's now tag-dispatchable.

Browse Source 
[SVN r73157]
This commit is contained in:
Adam Wulkiewicz
2011-07-16 22:00:42 +00:00
parent a55d592702
commit d70a1756f9
2 changed files with 84 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/boost/geometry/extensions/index/rtree/options.hpp
View File

@@ -20,6 +20,9 @@ struct insert_reinsert_tag {};
struct choose_by_content_diff_tag {};
struct choose_by_overlap_diff_tag {};
// SplitTag
struct split_default_tag {};
// RedistributeTag
struct linear_tag {};
struct quadratic_tag {};
@@ -75,12 +78,13 @@ struct rstar
namespace options {
template <typename Parameters, typename InsertTag, typename ChooseNextNodeTag, typename RedistributeTag, typename NodeTag>
template <typename Parameters, typename InsertTag, typename ChooseNextNodeTag, typename SplitTag, typename RedistributeTag, typename NodeTag>
struct rtree
{
typedef Parameters parameters_type;
typedef InsertTag insert_tag;
typedef ChooseNextNodeTag choose_next_node_tag;
typedef SplitTag split_tag;
typedef RedistributeTag redistribute_tag;
typedef NodeTag node_tag;
};
@@ -95,19 +99,6 @@ struct options_type
// TODO: awulkiew - use static assert
};
// default options
//template <typename Parameters, typename InsertTag, typename ChooseNextNodeTag, typename RedistributeTag, typename NodeTag>
//struct options_type< options::rtree<Parameters, InsertTag, ChooseNextNodeTag, RedistributeTag, NodeTag> >
//{
// typedef options::rtree<
// Parameters,
// InsertTag,
// ChooseNextNodeTag,
// RedistributeTag,
// NodeTag
// > type;
//};
template <size_t MaxElements, size_t MinElements>
struct options_type< linear<MaxElements, MinElements> >
{
@@ -115,6 +106,7 @@ struct options_type< linear<MaxElements, MinElements> >
linear<MaxElements, MinElements>,
insert_default_tag,
choose_by_content_diff_tag,
split_default_tag,
linear_tag,
node_default_static_tag
> type;
@@ -127,6 +119,7 @@ struct options_type< quadratic<MaxElements, MinElements> >
quadratic<MaxElements, MinElements>,
insert_default_tag,
choose_by_content_diff_tag,
split_default_tag,
quadratic_tag,
node_default_static_tag
> type;
@@ -139,6 +132,7 @@ struct options_type< rstar<MaxElements, MinElements, OverlapCostThreshold, Reins
rstar<MaxElements, MinElements, OverlapCostThreshold, ReinsertedElements>,
insert_reinsert_tag,
choose_by_overlap_diff_tag,
split_default_tag,
rstar_tag,
node_default_static_tag
> type;

118
include/boost/geometry/extensions/index/rtree/visitors/insert.hpp
View File

@@ -77,10 +77,82 @@ struct choose_next_node<Value, Options, Box, choose_by_content_diff_tag>
}
};
// ----------------------------------------------------------------------- //
// Not implemented here
template <typename Value, typename Options, typename Translator, typename Box, typename RedistributeTag>
struct redistribute_elements;
// ----------------------------------------------------------------------- //
// Split algorithm
template <typename Value, typename Options, typename Translator, typename Box, typename SplitTag>
class split;
// Default split algorithm
template <typename Value, typename Options, typename Translator, typename Box>
class split<Value, Options, Translator, Box, split_default_tag>
{
protected:
typedef typename rtree::node<Value, typename Options::parameters_type, Box, typename Options::node_tag>::type node;
typedef typename rtree::internal_node<Value, typename Options::parameters_type, Box, typename Options::node_tag>::type internal_node;
typedef typename rtree::leaf<Value, typename Options::parameters_type, Box, typename Options::node_tag>::type leaf;
typedef typename Options::parameters_type parameters_type;
public:
template <typename Node>
static inline void apply(node* & root_node,
size_t & leafs_level,
Node & n,
internal_node *parent_node,
size_t current_child_index,
Translator const& tr)
{
// create additional node
node * second_node = rtree::create_node(Node());
Node & n2 = rtree::get<Node>(*second_node);
// redistribute elements
Box box1, box2;
redistribute_elements<Value, Options, Translator, Box, typename Options::redistribute_tag>::
apply(n, n2, box1, box2, tr);
// check numbers of elements
BOOST_GEOMETRY_INDEX_ASSERT(parameters_type::min_elements <= rtree::elements(n).size() &&
rtree::elements(n).size() <= parameters_type::max_elements,
"unexpected number of elements");
BOOST_GEOMETRY_INDEX_ASSERT(parameters_type::min_elements <= rtree::elements(n2).size() &&
rtree::elements(n2).size() <= parameters_type::max_elements,
"unexpected number of elements");
// node is not the root - just add the new node
if ( parent_node != 0 )
{
// update old node's box
rtree::elements(*parent_node)[current_child_index].first = box1;
// add new node to the parent's children
rtree::elements(*parent_node).push_back(std::make_pair(box2, second_node));
}
// node is the root - add level
else
{
BOOST_GEOMETRY_INDEX_ASSERT(&n == rtree::get<Node>(root_node), "node should be the root");
// create new root and add nodes
node * new_root = rtree::create_node(internal_node());
rtree::elements(rtree::get<internal_node>(*new_root)).push_back(std::make_pair(box1, root_node));
rtree::elements(rtree::get<internal_node>(*new_root)).push_back(std::make_pair(box2, second_node));
root_node = new_root;
++leafs_level;
}
}
};
// ----------------------------------------------------------------------- //
// Default insert visitor
template <typename Element, typename Value, typename Options, typename Translator, typename Box>
class insert
@@ -169,52 +241,14 @@ protected:
m_current_level = current_level_bckup;
}
// TODO: awulkiew - implement dispatchable split::apply to enable additional nodes creation
template <typename Node>
inline void split(Node &n) const
inline void split(Node & n) const
{
// create additional node
node * second_node = rtree::create_node(Node());
Node & n2 = rtree::get<Node>(*second_node);
// redistribute elements
Box box1, box2;
redistribute_elements<Value, Options, Translator, Box, typename Options::redistribute_tag>::
apply(n, n2, box1, box2, m_tr);
// check numbers of elements
BOOST_GEOMETRY_INDEX_ASSERT(parameters_type::min_elements <= rtree::elements(n).size() &&
rtree::elements(n).size() <= parameters_type::max_elements,
"unexpected number of elements");
BOOST_GEOMETRY_INDEX_ASSERT(parameters_type::min_elements <= rtree::elements(n2).size() &&
rtree::elements(n2).size() <= parameters_type::max_elements,
"unexpected number of elements");
// node is not the root - just add the new node
if ( m_parent != 0 )
{
// update old node's box
rtree::elements(*m_parent)[m_current_child_index].first = box1;
// add new node to the parent's children
rtree::elements(*m_parent).push_back(std::make_pair(box2, second_node));
}
// node is the root - add level
else
{
BOOST_GEOMETRY_INDEX_ASSERT(&n == rtree::get<Node>(m_root_node), "node should be the root");
// create new root and add nodes
node * new_root = rtree::create_node(internal_node());
rtree::elements(rtree::get<internal_node>(*new_root)).push_back(std::make_pair(box1, m_root_node));
rtree::elements(rtree::get<internal_node>(*new_root)).push_back(std::make_pair(box2, second_node));
m_root_node = new_root;
++m_leafs_level;
}
detail::split<Value, Options, Translator, Box, typename Options::split_tag>::apply(m_root_node, m_leafs_level, n, m_parent, m_current_child_index, m_tr);
}
// TODO: awulkiew - implement dispatchable split::apply to enable additional nodes creation
Element const& m_element;
Translator const& m_tr;
const size_t m_relative_level;