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

nearest query optimized by rejecting distant nodes before adding them to the active branches list.

Browse Source 
[SVN r74610]
This commit is contained in:
Adam Wulkiewicz
2011-09-29 13:38:03 +00:00
parent 48176c64e6
commit 66c2cf2605
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/boost/geometry/extensions/index/rtree/visitors/nearest.hpp
View File

@@ -167,7 +167,7 @@ public:
, m_result(r)
{}
//TODO: awulkiew - check this approach: store one, global vector of active branches, add branches only if mindist is ok
//TODO: awulkiew - consider this approach: store one, global vector of active branches, add branches only if mindist is ok
inline void operator()(internal_node const& n)
{
@@ -191,6 +191,17 @@ public:
// calculate node's distance(s) for distance predicate
node_distances_type node_dist_data = node_distances_calc::apply(m_dist_pred, it->first);
// TODO: awulkiew - consider at first calculating just near distance,
// comparing it with m_result.comparable_distance if it's valid,
// after that calculate the rest of distances and check predicates
// if current node is further than found neighbors - don't analyze it
if ( m_result.is_comparable_distance_valid() &&
is_node_prunable(m_result.comparable_distance(), node_dist_data) )
{
continue;
}
// if current node distance(s) meets distance predicate
if ( node_distances_predicates_check::apply(m_dist_pred, node_dist_data) )
{
@@ -235,6 +246,10 @@ public:
// calculate values distance for distance predicate
value_distances_type distances = value_distances_calc::apply(m_dist_pred, m_tr(*it));
// TODO: awulkiew - consider at first calculating just point relation distance,
// comparing it with m_result.comparable_distance if it's valid,
// after that calculate the rest of distances and check predicates
// if distance meets distance predicate
if ( value_distances_predicates_check::apply(m_dist_pred, distances) )
{
@@ -261,7 +276,7 @@ private:
{
// prune if box's mindist is further than value's mindist
while ( !abl.empty() &&
prune_node(m_result.comparable_distance(), abl.back().first) )
is_node_prunable(m_result.comparable_distance(), abl.back().first) )
{
abl.pop_back();
}
@@ -279,7 +294,7 @@ private:
}
template <typename Distance>
static inline bool prune_node(Distance const& smallest_dist, node_distances_type const& d)
static inline bool is_node_prunable(Distance const& smallest_dist, node_distances_type const& d)
{
return smallest_dist
< index::detail::cdist_value<node_distances_type>

24
tests/additional_sizes_and_times.cpp
View File

@@ -221,7 +221,7 @@ int main()
// searching test
{
std::cout << "query(B) and value(odd index) searching time test... ("
std::cout << "pair: query(B) and value(odd index) searching time test... ("
<< queries_count << ")\n";
tim.restart();
size_t temp = 0;
@@ -241,6 +241,28 @@ int main()
std::cout << "found: " << temp << "\n";
}
// searching test
{
std::cout << "tuple: query(B) and value(odd index) searching time test... ("
<< queries_count << ")\n";
tim.restart();
size_t temp = 0;
for (size_t i = 0 ; i < queries_count ; ++i )
{
float x = coords[i].first;
float y = coords[i].second;
std::deque< std::pair<B, size_t> > result;
t.query(
boost::make_tuple(
B(P(x - 10, y - 10), P(x + 10, y + 10)),
bgi::value(test_pred< std::pair<B, size_t> >())
), std::back_inserter(result));
temp += result.size();
}
std::cout << "time: " << tim.elapsed() << "s\n";
std::cout << "found: " << temp << "\n";
}
// searching test
{
std::cout << "vector searching time test... ("