|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r81565 - in sandbox-branches/geometry/index_dev: doc/html doc/html/geometry_index/r_tree doc/rtree test/rtree
From: adam.wulkiewicz_at_[hidden]
Date: 2012-11-26 13:01:06
Author: awulkiew
Date: 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
New Revision: 81565
URL: http://svn.boost.org/trac/boost/changeset/81565
Log:
Each R*tree test divided into 2 files to decrease its size.
Added info about the Allocator in the docs.
Added:
sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_d_rt.cpp (contents, props changed)
sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_f_rt.cpp (contents, props changed)
sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_i_rt.cpp (contents, props changed)
sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_tt_rt.cpp (contents, props changed)
sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_d_rt.cpp (contents, props changed)
sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_f_rt.cpp (contents, props changed)
sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_i_rt.cpp (contents, props changed)
sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_tt_rt.cpp (contents, props changed)
Text files modified:
sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/creation_and_modification.html | 3 ++-
sandbox-branches/geometry/index_dev/doc/html/index.html | 2 +-
sandbox-branches/geometry/index_dev/doc/rtree/creation.qbk | 2 +-
sandbox-branches/geometry/index_dev/test/rtree/Jamfile.v2 | 8 ++++++++
sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_d.cpp | 1 -
sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_f.cpp | 1 -
sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_i.cpp | 1 -
sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_tt.cpp | 1 -
sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_d.cpp | 1 -
sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_f.cpp | 1 -
sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_i.cpp | 1 -
sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_tt.cpp | 1 -
12 files changed, 12 insertions(+), 11 deletions(-)
Modified: sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/creation_and_modification.html
==============================================================================
--- sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/creation_and_modification.html (original)
+++ sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/creation_and_modification.html 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -68,7 +68,8 @@
which R-tree can handle,
</li>
<li class="listitem">
- <code class="computeroutput"><span class="identifier">Allocator</span></code> - the allocator.
+ <code class="computeroutput"><span class="identifier">Allocator</span></code> - <code class="computeroutput"><span class="identifier">Value</span></code>s allocator, all allocators
+ needed by the container are created from it.
</li>
</ul></div>
</div>
Modified: sandbox-branches/geometry/index_dev/doc/html/index.html
==============================================================================
--- sandbox-branches/geometry/index_dev/doc/html/index.html (original)
+++ sandbox-branches/geometry/index_dev/doc/html/index.html 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -56,7 +56,7 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: November 26, 2012 at 17:31:48 GMT</small></p></td>
+<td align="left"><p><small>Last revised: November 26, 2012 at 17:58:58 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>
Modified: sandbox-branches/geometry/index_dev/doc/rtree/creation.qbk
==============================================================================
--- sandbox-branches/geometry/index_dev/doc/rtree/creation.qbk (original)
+++ sandbox-branches/geometry/index_dev/doc/rtree/creation.qbk 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -20,7 +20,7 @@
* `Parameters` - parameters type, inserting/splitting algorithm,
* `__translator__` - type of object translating `Value` objects to
`__indexable__` objects (`__point__` or `__box__`) which __rtree__ can handle,
-* `Allocator` - the allocator.
+* `Allocator` - `Value`s allocator, all allocators needed by the container are created from it.
[endsect]
Modified: sandbox-branches/geometry/index_dev/test/rtree/Jamfile.v2
==============================================================================
--- sandbox-branches/geometry/index_dev/test/rtree/Jamfile.v2 (original)
+++ sandbox-branches/geometry/index_dev/test/rtree/Jamfile.v2 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -22,6 +22,10 @@
[ run rtree2d_rstar_f.cpp ]
[ run rtree2d_rstar_d.cpp ]
[ run rtree2d_rstar_tt.cpp ]
+ [ run rtree2d_rstar_i_rt.cpp ]
+ [ run rtree2d_rstar_f_rt.cpp ]
+ [ run rtree2d_rstar_d_rt.cpp ]
+ [ run rtree2d_rstar_tt_rt.cpp ]
[ run rtree3d_linear_i.cpp ]
[ run rtree3d_linear_f.cpp ]
@@ -37,6 +41,10 @@
[ run rtree3d_rstar_f.cpp ]
[ run rtree3d_rstar_d.cpp ]
[ run rtree3d_rstar_tt.cpp ]
+ [ run rtree3d_rstar_i_rt.cpp ]
+ [ run rtree3d_rstar_f_rt.cpp ]
+ [ run rtree3d_rstar_d_rt.cpp ]
+ [ run rtree3d_rstar_tt_rt.cpp ]
[ run rtree_exceptions.cpp ]
;
Modified: sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_d.cpp
==============================================================================
--- sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_d.cpp (original)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_d.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -18,7 +18,6 @@
typedef bg::model::point<double, 2, bg::cs::cartesian> P2dc;
test_rtree<P2dc, bgi::rstar<4, 2> >();
- test_rtree<P2dc>(bgi::runtime::rstar(4, 2));
return 0;
}
Added: sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_d_rt.cpp
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_d_rt.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -0,0 +1,23 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <rtree/test_rtree.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+int test_main(int, char* [])
+{
+ typedef bg::model::point<double, 2, bg::cs::cartesian> P2dc;
+
+ test_rtree<P2dc>(bgi::runtime::rstar(4, 2));
+
+ return 0;
+}
Modified: sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_f.cpp
==============================================================================
--- sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_f.cpp (original)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_f.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -18,7 +18,6 @@
typedef bg::model::point<float, 2, bg::cs::cartesian> P2fc;
test_rtree<P2fc, bgi::rstar<4, 2> >();
- test_rtree<P2fc>(bgi::runtime::rstar(4, 2));
return 0;
}
Added: sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_f_rt.cpp
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_f_rt.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -0,0 +1,23 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <rtree/test_rtree.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+int test_main(int, char* [])
+{
+ typedef bg::model::point<float, 2, bg::cs::cartesian> P2fc;
+
+ test_rtree<P2fc>(bgi::runtime::rstar(4, 2));
+
+ return 0;
+}
Modified: sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_i.cpp
==============================================================================
--- sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_i.cpp (original)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_i.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -18,7 +18,6 @@
typedef bg::model::point<int, 2, bg::cs::cartesian> P2ic;
test_rtree<P2ic, bgi::rstar<4, 2> >();
- test_rtree<P2ic>(bgi::runtime::rstar(4, 2));
return 0;
}
Added: sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_i_rt.cpp
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_i_rt.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -0,0 +1,23 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <rtree/test_rtree.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+int test_main(int, char* [])
+{
+ typedef bg::model::point<int, 2, bg::cs::cartesian> P2ic;
+
+ test_rtree<P2ic>(bgi::runtime::rstar(4, 2));
+
+ return 0;
+}
Modified: sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_tt.cpp
==============================================================================
--- sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_tt.cpp (original)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_tt.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -20,7 +20,6 @@
typedef bg::model::point<ttmath_big, 2, bg::cs::cartesian> P2ttmc;
test_rtree<P2ttmc, bgi::rstar<4, 2> >();
- test_rtree<P2ttmc>(bgi::runtime::rstar(4, 2));
#endif
return 0;
Added: sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_tt_rt.cpp
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree2d_rstar_tt_rt.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -0,0 +1,26 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <rtree/test_rtree.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+int test_main(int, char* [])
+{
+
+#ifdef HAVE_TTMATH
+ typedef bg::model::point<ttmath_big, 2, bg::cs::cartesian> P2ttmc;
+
+ test_rtree<P2ttmc>(bgi::runtime::rstar(4, 2));
+#endif
+
+ return 0;
+}
Modified: sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_d.cpp
==============================================================================
--- sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_d.cpp (original)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_d.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -18,7 +18,6 @@
typedef bg::model::point<double, 3, bg::cs::cartesian> P3dc;
test_rtree<P3dc, bgi::rstar<4, 2> >();
- test_rtree<P3dc>(bgi::runtime::rstar(4, 2));
return 0;
}
Added: sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_d_rt.cpp
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_d_rt.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -0,0 +1,23 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <rtree/test_rtree.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+int test_main(int, char* [])
+{
+ typedef bg::model::point<double, 3, bg::cs::cartesian> P3dc;
+
+ test_rtree<P3dc>(bgi::runtime::rstar(4, 2));
+
+ return 0;
+}
Modified: sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_f.cpp
==============================================================================
--- sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_f.cpp (original)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_f.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -18,7 +18,6 @@
typedef bg::model::point<float, 3, bg::cs::cartesian> P3fc;
test_rtree<P3fc, bgi::rstar<4, 2> >();
- test_rtree<P3fc>(bgi::runtime::rstar(4, 2));
return 0;
}
Added: sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_f_rt.cpp
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_f_rt.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -0,0 +1,23 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <rtree/test_rtree.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+int test_main(int, char* [])
+{
+ typedef bg::model::point<float, 3, bg::cs::cartesian> P3fc;
+
+ test_rtree<P3fc>(bgi::runtime::rstar(4, 2));
+
+ return 0;
+}
Modified: sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_i.cpp
==============================================================================
--- sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_i.cpp (original)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_i.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -18,7 +18,6 @@
typedef bg::model::point<int, 3, bg::cs::cartesian> P3ic;
test_rtree<P3ic, bgi::rstar<4, 2> >();
- test_rtree<P3ic>(bgi::runtime::rstar(4, 2));
return 0;
}
Added: sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_i_rt.cpp
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_i_rt.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -0,0 +1,23 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <rtree/test_rtree.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+int test_main(int, char* [])
+{
+ typedef bg::model::point<int, 3, bg::cs::cartesian> P3ic;
+
+ test_rtree<P3ic>(bgi::runtime::rstar(4, 2));
+
+ return 0;
+}
Modified: sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_tt.cpp
==============================================================================
--- sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_tt.cpp (original)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_tt.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -20,7 +20,6 @@
typedef bg::model::point<ttmath_big, 3, bg::cs::cartesian> P3ttmc;
test_rtree<P3ttmc, bgi::rstar<4, 2> >();
- test_rtree<P3ttmc>(bgi::runtime::rstar(4, 2));
#endif
return 0;
Added: sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_tt_rt.cpp
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree3d_rstar_tt_rt.cpp 2012-11-26 13:01:04 EST (Mon, 26 Nov 2012)
@@ -0,0 +1,26 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <rtree/test_rtree.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+int test_main(int, char* [])
+{
+
+#ifdef HAVE_TTMATH
+ typedef bg::model::point<ttmath_big, 3, bg::cs::cartesian> P3ttmc;
+
+ test_rtree<P3ttmc>(bgi::runtime::rstar(4, 2));
+#endif
+
+ return 0;
+}
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