Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r83934 - in trunk/libs/geometry/test/index/rtree: . generated
From: adam.wulkiewicz_at_[hidden]
Date: 2013-04-16 18:07:44

Author: awulkiew
Date: 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
New Revision: 83934
URL: http://svn.boost.org/trac/boost/changeset/83934

Log:
geometry.index test: changed rtree parameters to ensure that rtree will have at least 3 levels, added test for experimental spatial query iterator.
Text files modified:
   trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_b2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_b3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_p2d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_p3d.cpp | 2 +-
   trunk/libs/geometry/test/index/rtree/rtree_test_generator.cpp | 12 ++++++------
   trunk/libs/geometry/test/index/rtree/test_rtree.hpp | 15 +++++++++++++++
   74 files changed, 93 insertions(+), 78 deletions(-)

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::additional<Indexable>(bgi::dynamic_linear(8, 3), std::allocator<int>());
+ testset::additional<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::additional<Indexable>(bgi::dynamic_linear(8, 3), std::allocator<int>());
+ testset::additional<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::additional<Indexable>(bgi::dynamic_linear(8, 3), std::allocator<int>());
+ testset::additional<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_add_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::additional<Indexable>(bgi::dynamic_linear(8, 3), std::allocator<int>());
+ testset::additional<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::modifiers<Indexable>(bgi::dynamic_linear(8, 3), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::modifiers<Indexable>(bgi::dynamic_linear(8, 3), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::modifiers<Indexable>(bgi::dynamic_linear(8, 3), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_mod_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::modifiers<Indexable>(bgi::dynamic_linear(8, 3), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::queries<Indexable>(bgi::dynamic_linear(8, 3), std::allocator<int>());
+ testset::queries<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::queries<Indexable>(bgi::dynamic_linear(8, 3), std::allocator<int>());
+ testset::queries<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::queries<Indexable>(bgi::dynamic_linear(8, 3), std::allocator<int>());
+ testset::queries<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dlin_que_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::queries<Indexable>(bgi::dynamic_linear(8, 3), std::allocator<int>());
+ testset::queries<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::additional<Indexable>(bgi::dynamic_quadratic(8, 3), std::allocator<int>());
+ testset::additional<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::additional<Indexable>(bgi::dynamic_quadratic(8, 3), std::allocator<int>());
+ testset::additional<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::additional<Indexable>(bgi::dynamic_quadratic(8, 3), std::allocator<int>());
+ testset::additional<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_add_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::additional<Indexable>(bgi::dynamic_quadratic(8, 3), std::allocator<int>());
+ testset::additional<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::modifiers<Indexable>(bgi::dynamic_quadratic(8, 3), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::modifiers<Indexable>(bgi::dynamic_quadratic(8, 3), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::modifiers<Indexable>(bgi::dynamic_quadratic(8, 3), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_mod_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::modifiers<Indexable>(bgi::dynamic_quadratic(8, 3), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::queries<Indexable>(bgi::dynamic_quadratic(8, 3), std::allocator<int>());
+ testset::queries<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::queries<Indexable>(bgi::dynamic_quadratic(8, 3), std::allocator<int>());
+ testset::queries<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::queries<Indexable>(bgi::dynamic_quadratic(8, 3), std::allocator<int>());
+ testset::queries<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_dqua_que_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::queries<Indexable>(bgi::dynamic_quadratic(8, 3), std::allocator<int>());
+ testset::queries<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::additional<Indexable>(bgi::dynamic_rstar(8, 3), std::allocator<int>());
+ testset::additional<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::additional<Indexable>(bgi::dynamic_rstar(8, 3), std::allocator<int>());
+ testset::additional<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::additional<Indexable>(bgi::dynamic_rstar(8, 3), std::allocator<int>());
+ testset::additional<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_drst_add_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::additional<Indexable>(bgi::dynamic_rstar(8, 3), std::allocator<int>());
+ testset::additional<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::modifiers<Indexable>(bgi::dynamic_rstar(8, 3), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::modifiers<Indexable>(bgi::dynamic_rstar(8, 3), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::modifiers<Indexable>(bgi::dynamic_rstar(8, 3), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_drst_mod_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::modifiers<Indexable>(bgi::dynamic_rstar(8, 3), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::queries<Indexable>(bgi::dynamic_rstar(8, 3), std::allocator<int>());
+ testset::queries<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::queries<Indexable>(bgi::dynamic_rstar(8, 3), std::allocator<int>());
+ testset::queries<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::queries<Indexable>(bgi::dynamic_rstar(8, 3), std::allocator<int>());
+ testset::queries<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_drst_que_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::queries<Indexable>(bgi::dynamic_rstar(8, 3), std::allocator<int>());
+ testset::queries<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::additional<Indexable>(bgi::linear<8, 3>(), std::allocator<int>());
+ testset::additional<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::additional<Indexable>(bgi::linear<8, 3>(), std::allocator<int>());
+ testset::additional<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::additional<Indexable>(bgi::linear<8, 3>(), std::allocator<int>());
+ testset::additional<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_lin_add_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::additional<Indexable>(bgi::linear<8, 3>(), std::allocator<int>());
+ testset::additional<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::modifiers<Indexable>(bgi::linear<8, 3>(), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::modifiers<Indexable>(bgi::linear<8, 3>(), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::modifiers<Indexable>(bgi::linear<8, 3>(), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_lin_mod_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::modifiers<Indexable>(bgi::linear<8, 3>(), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::queries<Indexable>(bgi::linear<8, 3>(), std::allocator<int>());
+ testset::queries<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::queries<Indexable>(bgi::linear<8, 3>(), std::allocator<int>());
+ testset::queries<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::queries<Indexable>(bgi::linear<8, 3>(), std::allocator<int>());
+ testset::queries<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_lin_que_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::queries<Indexable>(bgi::linear<8, 3>(), std::allocator<int>());
+ testset::queries<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::additional<Indexable>(bgi::quadratic<8, 3>(), std::allocator<int>());
+ testset::additional<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::additional<Indexable>(bgi::quadratic<8, 3>(), std::allocator<int>());
+ testset::additional<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::additional<Indexable>(bgi::quadratic<8, 3>(), std::allocator<int>());
+ testset::additional<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_qua_add_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::additional<Indexable>(bgi::quadratic<8, 3>(), std::allocator<int>());
+ testset::additional<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::modifiers<Indexable>(bgi::quadratic<8, 3>(), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::modifiers<Indexable>(bgi::quadratic<8, 3>(), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::modifiers<Indexable>(bgi::quadratic<8, 3>(), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_qua_mod_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::modifiers<Indexable>(bgi::quadratic<8, 3>(), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::queries<Indexable>(bgi::quadratic<8, 3>(), std::allocator<int>());
+ testset::queries<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::queries<Indexable>(bgi::quadratic<8, 3>(), std::allocator<int>());
+ testset::queries<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::queries<Indexable>(bgi::quadratic<8, 3>(), std::allocator<int>());
+ testset::queries<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_qua_que_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::queries<Indexable>(bgi::quadratic<8, 3>(), std::allocator<int>());
+ testset::queries<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::additional<Indexable>(bgi::rstar<8, 3>(), std::allocator<int>());
+ testset::additional<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::additional<Indexable>(bgi::rstar<8, 3>(), std::allocator<int>());
+ testset::additional<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::additional<Indexable>(bgi::rstar<8, 3>(), std::allocator<int>());
+ testset::additional<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_rst_add_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::additional<Indexable>(bgi::rstar<8, 3>(), std::allocator<int>());
+ testset::additional<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::modifiers<Indexable>(bgi::rstar<8, 3>(), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::modifiers<Indexable>(bgi::rstar<8, 3>(), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::modifiers<Indexable>(bgi::rstar<8, 3>(), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_rst_mod_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::modifiers<Indexable>(bgi::rstar<8, 3>(), std::allocator<int>());
+ testset::modifiers<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_b2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_b2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_b2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
- testset::queries<Indexable>(bgi::rstar<8, 3>(), std::allocator<int>());
+ testset::queries<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_b3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_b3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_b3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
- testset::queries<Indexable>(bgi::rstar<8, 3>(), std::allocator<int>());
+ testset::queries<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_p2d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_p2d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_p2d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
- testset::queries<Indexable>(bgi::rstar<8, 3>(), std::allocator<int>());
+ testset::queries<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_p3d.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_p3d.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/generated/rtree_rst_que_p3d.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -15,6 +15,6 @@
int test_main(int, char* [])
{
typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
- testset::queries<Indexable>(bgi::rstar<8, 3>(), std::allocator<int>());
+ testset::queries<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
return 0;
}

Modified: trunk/libs/geometry/test/index/rtree/rtree_test_generator.cpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/rtree_test_generator.cpp (original)
+++ trunk/libs/geometry/test/index/rtree/rtree_test_generator.cpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -27,12 +27,12 @@

     typedef boost::tuple<std::string, std::string> P;
     std::vector<P> parameters;
- parameters.push_back(boost::make_tuple("bgi::linear<8, 3>()", "lin"));
- parameters.push_back(boost::make_tuple("bgi::dynamic_linear(8, 3)", "dlin"));
- parameters.push_back(boost::make_tuple("bgi::quadratic<8, 3>()", "qua"));
- parameters.push_back(boost::make_tuple("bgi::dynamic_quadratic(8, 3)", "dqua"));
- parameters.push_back(boost::make_tuple("bgi::rstar<8, 3>()", "rst"));
- parameters.push_back(boost::make_tuple("bgi::dynamic_rstar(8, 3)","drst"));
+ parameters.push_back(boost::make_tuple("bgi::linear<5, 2>()", "lin"));
+ parameters.push_back(boost::make_tuple("bgi::dynamic_linear(5, 2)", "dlin"));
+ parameters.push_back(boost::make_tuple("bgi::quadratic<5, 2>()", "qua"));
+ parameters.push_back(boost::make_tuple("bgi::dynamic_quadratic(5, 2)", "dqua"));
+ parameters.push_back(boost::make_tuple("bgi::rstar<5, 2>()", "rst"));
+ parameters.push_back(boost::make_tuple("bgi::dynamic_rstar(5, 2)","drst"));

     std::vector<std::string> indexables;
     indexables.push_back("p");

Modified: trunk/libs/geometry/test/index/rtree/test_rtree.hpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/test_rtree.hpp (original)
+++ trunk/libs/geometry/test/index/rtree/test_rtree.hpp 2013-04-16 18:07:37 EDT (Tue, 16 Apr 2013)
@@ -642,6 +642,13 @@

// spatial query

+template <typename Iterator, typename Container>
+void spatial_query_iterator(Iterator first, Iterator last, Container & container)
+{
+ for ( ; first != last ; ++first )
+ container.push_back(*first);
+}
+
template <typename Rtree, typename Value, typename Predicates>
void spatial_query(Rtree & rtree, Predicates const& pred, std::vector<Value> const& expected_output)
{
@@ -662,6 +669,14 @@
exactly_the_same_outputs(rtree, output, output2);

exactly_the_same_outputs(rtree, output, rtree | bgi::adaptors::queried(pred));
+
+#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
+ std::vector<Value> output3;
+ //std::copy(rtree.qbegin(pred), rtree.qend(pred), std::back_inserter(output3));
+ spatial_query_iterator(rtree.qbegin(pred), rtree.qend(pred), output3);
+
+ compare_outputs(rtree, output3, expected_output);
+#endif
}

// rtree specific queries tests

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk