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

root box calculation after remove moved from rtree::raw_remove() to visitor::remove.

Browse Source 
[SVN r82522]
This commit is contained in:
Adam Wulkiewicz
2013-01-17 14:37:40 +00:00
parent 2f5ddeb8a6
commit 4836bbabce
3 changed files with 46 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
tests/additional_speed.cpp
View File

@@ -71,8 +71,6 @@ int main()
// inserting test
{
std::cout << "rtree inserting time test... ("
<< values_count << ")\n";
tim.restart();
for (size_t i = 0 ; i < values_count ; ++i )
{
@@ -82,14 +80,8 @@ int main()
t.insert(b);
}
std::cout << "time: " << tim.elapsed() << "s\n";
}
{
float x = coords[0].first;
float y = coords[0].second;
B b(P(x - 0.5f, y - 0.5f), P(x + 0.5f, y + 0.5f));
t.remove(b);
double time = tim.elapsed();
std::cout << time << "s - insert " << values_count << '\n';
}
std::vector<B> result;
@@ -98,8 +90,6 @@ int main()
// query test
{
std::cout << "query(B) searching time test... ("
<< queries_count << ")\n";
tim.restart();
size_t temp = 0;
for (size_t i = 0 ; i < queries_count ; ++i )
@@ -110,16 +100,14 @@ int main()
t.spatial_query(B(P(x - 10, y - 10), P(x + 10, y + 10)), std::back_inserter(result));
temp += result.size();
}
std::cout << "time: " << tim.elapsed() << "s\n";
std::cout << "found: " << temp << "\n";
double time = tim.elapsed();
std::cout << time << "s - spatial_query(B) " << queries_count << " found " << temp << '\n';
}
result.clear();
// searching test
{
std::cout << "nearest 10 searching time test... ("
<< queries_count / 10 << ")\n";
tim.restart();
size_t temp = 0;
for (size_t i = 0 ; i < queries_count / 10 ; ++i )
@@ -129,13 +117,11 @@ int main()
result.clear();
temp += t.nearest_query(P(x, y), 5, std::back_inserter(result));
}
std::cout << "time: " << tim.elapsed() << "s\n";
std::cout << "found: " << temp << "\n";
double time = tim.elapsed();
std::cout << time << "s - nearest_query(P, 5) " << (queries_count / 10) << " found " << temp << '\n';
}
{
std::cout << "nearest 1 searching time test... ("
<< queries_count / 10 << ")\n";
tim.restart();
size_t temp = 0;
for (size_t i = 0 ; i < queries_count / 10 ; ++i )
@@ -144,8 +130,23 @@ int main()
float y = coords[i].second + 100;
temp += t.nearest_query(P(x, y), result_one);
}
std::cout << "time: " << tim.elapsed() << "s\n";
std::cout << "found: " << temp << "\n";
double time = tim.elapsed();
std::cout << time << "s - nearest_query(P) " << (queries_count / 10) << " found " << temp << '\n';
}
// inserting test
{
tim.restart();
for (size_t i = 0 ; i < values_count / 10 ; ++i )
{
float x = coords[i].first;
float y = coords[i].second;
B b(P(x - 0.5f, y - 0.5f), P(x + 0.5f, y + 0.5f));
t.remove(b);
}
double time = tim.elapsed();
std::cout << time << "s - remove " << values_count / 10 << '\n';
}
}