Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r81350 - in sandbox-branches/geometry/index_dev: boost/geometry/extensions/index/rtree doc doc/html doc/html/geometry_index doc/html/geometry_index/r_tree doc/rtree
From: adam.wulkiewicz_at_[hidden]
Date: 2012-11-14 18:35:16

Author: awulkiew
Date: 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
New Revision: 81350
URL: http://svn.boost.org/trac/boost/changeset/81350

Log:
remove() don't return if there is no root, assertion check is done in raw_remove().
Docs updated.
Added:
   sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/creation_and_modification.html (contents, props changed)
   sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/exception_safety.html (contents, props changed)
   sandbox-branches/geometry/index_dev/doc/rtree/exception_safety.qbk (contents, props changed)
   sandbox-branches/geometry/index_dev/doc/rtree/nearest_query.qbk (contents, props changed)
   sandbox-branches/geometry/index_dev/doc/rtree/spatial_query.qbk (contents, props changed)
Removed:
   sandbox-branches/geometry/index_dev/doc/rtree/nearest.qbk
   sandbox-branches/geometry/index_dev/doc/rtree/query.qbk
Text files modified:
   sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/rtree.hpp | 8 ------
   sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree.html | 18 ++++++++++-----
   sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/nearest_neighbours_queries.html | 39 ++++++++++++++++++-----------------
   sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/rtree_quickstart.html | 14 ++++++------
   sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/spatial_queries.html | 28 +++++++++++-------------
   sandbox-branches/geometry/index_dev/doc/html/index.html | 6 +++-
   sandbox-branches/geometry/index_dev/doc/rtree.qbk | 5 ++-
   sandbox-branches/geometry/index_dev/doc/rtree/creation.qbk | 44 ++++++++++++++++++++++++++++++++++-----
   sandbox-branches/geometry/index_dev/doc/rtree/quickstart.qbk | 6 ++--
   9 files changed, 101 insertions(+), 67 deletions(-)

Modified: sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/rtree.hpp
==============================================================================
--- sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/rtree.hpp (original)
+++ sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/rtree.hpp 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -116,7 +116,7 @@
 /*!
 The constructor.

- \note Exception-safety: basic
+ \note Exception-safety: strong

 \param first The beginning of the range of Values.
 \param last The end of the range of Values.
@@ -294,9 +294,6 @@
 */
 inline void remove(value_type const& value)
 {
- if ( !m_root )
- return;
-
 this->raw_remove(value);
 }

@@ -311,9 +308,6 @@
 template <typename Iterator>
 inline void remove(Iterator first, Iterator last)
 {
- if ( !m_root )
- return;
-
 for ( ; first != last ; ++first )
 this->raw_remove(*first);
 }

Modified: sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree.html
==============================================================================
--- sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree.html (original)
+++ sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree.html 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -29,15 +29,20 @@
<div class="toc"><dl>
<dt>Introduction</dt>
<dt>Quick Start</dt>
-<dt>R-tree creation</dt>
+<dt><a href="r_tree/creation_and_modification.html">Creation
+ and modification</a></dt>
<dd><dl>
-<dt><a href="r_tree/r_tree_creation.html#geometry_index.r_tree.r_tree_creation.r_tree_template_parameters">R-tree
- template parameters</a></dt>
-<dt><a href="r_tree/r_tree_creation.html#geometry_index.r_tree.r_tree_creation.values__indexables_and_default_translator">Values,
+<dt><a href="r_tree/creation_and_modification.html#geometry_index.r_tree.creation_and_modification.template_parameters">Template
+ parameters</a></dt>
+<dt><a href="r_tree/creation_and_modification.html#geometry_index.r_tree.creation_and_modification.values__indexables_and_default_translator">Values,
 Indexables and default Translator</a></dt>
-<dt><a href="r_tree/r_tree_creation.html#geometry_index.r_tree.r_tree_creation.inserting_and_splitting_algorithms">Inserting
+<dt><a href="r_tree/creation_and_modification.html#geometry_index.r_tree.creation_and_modification.inserting_and_splitting_algorithms">Inserting
 and splitting algorithms</a></dt>
-<dt><a href="r_tree/r_tree_creation.html#geometry_index.r_tree.r_tree_creation.inserting_and_removing_values">Inserting
+<dt><a href="r_tree/creation_and_modification.html#geometry_index.r_tree.creation_and_modification.inserting_and_splitting_algorithms__run_time_">Inserting
+ and splitting algorithms (run-time)</a></dt>
+<dt><a href="r_tree/creation_and_modification.html#geometry_index.r_tree.creation_and_modification.copying_and_moving">Copying
+ and moving</a></dt>
+<dt><a href="r_tree/creation_and_modification.html#geometry_index.r_tree.creation_and_modification.inserting_and_removing_values">Inserting
 and removing Values</a></dt>
</dl></dd>
<dt>Spatial queries</dt>
@@ -59,6 +64,7 @@
<dt><a href="r_tree/nearest_neighbours_queries.html#geometry_index.r_tree.nearest_neighbours_queries.using_spatial_predicates">Using
 spatial predicates</a></dt>
</dl></dd>
+<dt>Exception safety</dt>
</dl></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Added: sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/creation_and_modification.html
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/creation_and_modification.html 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -0,0 +1,225 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Creation and modification</title>
+<link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
+<link rel="home" href="../../index.html" title="Chapter 1. Geometry Index">
+<link rel="up" href="../r_tree.html" title="R-tree">
+<link rel="prev" href="rtree_quickstart.html" title="Quick Start">
+<link rel="next" href="spatial_queries.html" title="Spatial queries">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="http://www.boost.org/doc/libs/release/boost.png"></td>
+<td align="center">Home</td>
+<td align="center">Libraries</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
+<td align="center">More</td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="rtree_quickstart.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="spatial_queries.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/next.png" alt="Next"></a>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="geometry_index.r_tree.creation_and_modification"></a><a class="link" href="creation_and_modification.html" title="Creation and modification">Creation
+ and modification</a>
+</h3></div></div></div>
+<div class="toc"><dl>
+<dt><a href="creation_and_modification.html#geometry_index.r_tree.creation_and_modification.template_parameters">Template
+ parameters</a></dt>
+<dt><a href="creation_and_modification.html#geometry_index.r_tree.creation_and_modification.values__indexables_and_default_translator">Values,
+ Indexables and default Translator</a></dt>
+<dt><a href="creation_and_modification.html#geometry_index.r_tree.creation_and_modification.inserting_and_splitting_algorithms">Inserting
+ and splitting algorithms</a></dt>
+<dt><a href="creation_and_modification.html#geometry_index.r_tree.creation_and_modification.inserting_and_splitting_algorithms__run_time_">Inserting
+ and splitting algorithms (run-time)</a></dt>
+<dt><a href="creation_and_modification.html#geometry_index.r_tree.creation_and_modification.copying_and_moving">Copying
+ and moving</a></dt>
+<dt><a href="creation_and_modification.html#geometry_index.r_tree.creation_and_modification.inserting_and_removing_values">Inserting
+ and removing Values</a></dt>
+</dl></div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="geometry_index.r_tree.creation_and_modification.template_parameters"></a><a class="link" href="creation_and_modification.html#geometry_index.r_tree.creation_and_modification.template_parameters" title="Template parameters">Template
+ parameters</a>
+</h4></div></div></div>
+
+ R-tree has 4 parameters:
+ 
+<pre class="programlisting">rtree<Value, Parameters, Translator, Allocator>
+</pre>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+ <code class="computeroutput">Value</code> - type of object which will be stored in the container.
+ </li>
+<li class="listitem">
+ <code class="computeroutput">Parameters</code> - compile-time
+ parameters, e.g. inserting/splitting algorithm with min and max nodes'
+ elements numbers.
+ </li>
+<li class="listitem">
+ <code class="computeroutput">Translator</code> - type of object translating <code class="computeroutput">Value</code> objects to <code class="computeroutput">Indexable</code>
+ objects (<code class="computeroutput">Point</code>
+ or <code class="computeroutput">Box</code>)
+ which R-tree can handle.
+ </li>
+<li class="listitem">
+ <code class="computeroutput">Allocator</code> - the allocator.
+ </li>
+</ul></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="geometry_index.r_tree.creation_and_modification.values__indexables_and_default_translator"></a><a class="link" href="creation_and_modification.html#geometry_index.r_tree.creation_and_modification.values__indexables_and_default_translator" title="Values, Indexables and default Translator">Values,
+ Indexables and default Translator</a>
+</h4></div></div></div>
+
+ R-tree may store <code class="computeroutput">Value</code>s of any type as long the <code class="computeroutput">Translator</code>
+ is passed as parameter. It knows how to interpret those <code class="computeroutput">Value</code>s
+ and extract an object understandable by the R-tree. Those objects are called
+ <code class="computeroutput">Indexable</code>s. Each type adapted to <code class="computeroutput">Point</code>
+ or <code class="computeroutput">Box</code>
+ concept is an <code class="computeroutput">Indexable</code>. Default <code class="computeroutput">Translator</code>
+ <code class="computeroutput">index::translator::def<Value></code>
+ is able to handle <code class="computeroutput">Point</code>,
+ <code class="computeroutput">Box</code>,
+ <code class="computeroutput">std::pair<...></code>,
+ pointer, iterator or smart pointer.
+ 
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+ <code class="computeroutput">Indexable = Point
+ | Box</code>
+ </li>
+<li class="listitem">
+ <code class="computeroutput">BasicValue =
+ Indexable |
+ std::pair<Indexable, T> | std::pair<T, Indexable></code>
+ </li>
+<li class="listitem">
+ <code class="computeroutput">Value = BasicValue
+ | BasicValue* | Iterator<BasicValue>
+ | SmartPtr<BasicValue></code>
+ </li>
+</ul></div>
+
+ Examples of <code class="computeroutput">Value</code> types:
+ 
+<pre class="programlisting">geometry::model::point<...>
+geometry::model::point_xy<...>
+geometry::model::box<...>
+std::pair<geometry::model::box<...>, size_t>
+</pre>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="geometry_index.r_tree.creation_and_modification.inserting_and_splitting_algorithms"></a><a class="link" href="creation_and_modification.html#geometry_index.r_tree.creation_and_modification.inserting_and_splitting_algorithms" title="Inserting and splitting algorithms">Inserting
+ and splitting algorithms</a>
+</h4></div></div></div>
+
+ <code class="computeroutput">Value</code>s may be inserted to the R-tree in many various ways.
+ Final internal structure of the R-tree depends on algorithms used in the
+ insertion process. The most important is nodes' splitting algorithm. Currently,
+ three well-known types of R-trees may be created.
+ 
+
+ Linear - classic R-tree using splitting algorithm of linear complexity
+ 
+<pre class="programlisting">index::rtree< Value, index::linear<32, 8> > rt;
+</pre>
+
+ Quadratic - classic R-tree using splitting algorithm of quadratic complexity
+ 
+<pre class="programlisting">index::rtree< Value, index::quadratic<32, 8> > rt;
+</pre>
+
+ R*-tree - splitting algorithm minimizing nodes' overlap with forced reinsertions
+ 
+<pre class="programlisting">index::rtree< Value, index::rstar<32, 8> > rt;
+</pre>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="geometry_index.r_tree.creation_and_modification.inserting_and_splitting_algorithms__run_time_"></a><a class="link" href="creation_and_modification.html#geometry_index.r_tree.creation_and_modification.inserting_and_splitting_algorithms__run_time_" title="Inserting and splitting algorithms (run-time)">Inserting
+ and splitting algorithms (run-time)</a>
+</h4></div></div></div>
+
+ By default splitting algorithm parameters are passed to the R-tree in compile
+ time. To use run-time versions of the R-tree one may pass parameters defined
+ in index::runtime namespace.
+ 
+<pre class="programlisting">// linear
+index::rtree<Value, index::runtime::linear> rt(index::runtime::linear(32, 8));
+// quadratic
+index::rtree<Value, index::runtime::quadratic> rt(index::runtime::quadratic(32, 8));
+// rstar
+index::rtree<Value, index::runtime::rstar> rt(index::runtime::rstar(32, 8));
+</pre>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="geometry_index.r_tree.creation_and_modification.copying_and_moving"></a><a class="link" href="creation_and_modification.html#geometry_index.r_tree.creation_and_modification.copying_and_moving" title="Copying and moving">Copying
+ and moving</a>
+</h4></div></div></div>
+
+ The R-tree is copyable and movable container. Move semantics is implemented
+ using Boost.Move library which also supports compilers not supporting rvalue
+ references.
+ 
+<pre class="programlisting">index::rtree< Value, index::quadratic<32, 8> > rt1;
+// copy constructor
+index::rtree< Value, index::quadratic<32, 8> > rt2;
+// copy assignment
+rt2 = r1;
+// move constructor
+index::rtree< Value, index::quadratic<32, 8> > rt3(boost::move(rt1));
+// move assignment
+rt3 = boost::move(rt2);
+</pre>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="geometry_index.r_tree.creation_and_modification.inserting_and_removing_values"></a><a class="link" href="creation_and_modification.html#geometry_index.r_tree.creation_and_modification.inserting_and_removing_values" title="Inserting and removing Values">Inserting
+ and removing Values</a>
+</h4></div></div></div>
+
+ Following code creates an R-tree using quadratic algorithm.
+ 
+<pre class="programlisting">using namespace boost::geometry;
+typedef std::pair<Box, int> Value;
+index::rtree< Value, index::quadratic<32, 8> > rt;
+</pre>
+
+ To insert or remove Value's by method calls one may use the following code.
+ 
+<pre class="programlisting">Value v = std::make_pair(Box(...), 0);
+rt.insert(v);
+rt.remove(v);
+</pre>
+
+ To insert or remove Value's by function calls one may use the following
+ code.
+ 
+<pre class="programlisting">Value v = std::make_pair(Box(...), 0);
+index::insert(rt, v);
+index::remove(rt, v);
+</pre>
+</div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer">Copyright © 2011, 2012 Adam Wulkiewicz Copyright © 2008 Federico J. Fernandez
+ Distributed under 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)
+ 
+</div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="rtree_quickstart.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="spatial_queries.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/next.png" alt="Next"></a>
+</div>
+</body>
+</html>

Added: sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/exception_safety.html
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/exception_safety.html 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -0,0 +1,297 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Exception safety</title>
+<link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
+<link rel="home" href="../../index.html" title="Chapter 1. Geometry Index">
+<link rel="up" href="../r_tree.html" title="R-tree">
+<link rel="prev" href="nearest_neighbours_queries.html" title="Nearest neighbours queries">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table cellpadding="2" width="100%"><tr>
+<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="http://www.boost.org/doc/libs/release/boost.png"></td>
+<td align="center">Home</td>
+<td align="center">Libraries</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
+<td align="center">More</td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="nearest_neighbours_queries.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="geometry_index.r_tree.exception_safety"></a><a class="link" href="exception_safety.html" title="Exception safety">Exception safety</a>
+</h3></div></div></div>
+
+ In order to be exception-safe the R-tree requires:
+ 
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+ Nonthrowing copy constructor of the <code class="computeroutput">CoordinateType</code>
+ used in the <code class="computeroutput">Indexable</code>,
+ </li>
+<li class="listitem">
+ Nonthrowing destructor of the <code class="computeroutput">Value</code>.
+ </li>
+</ul></div>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+ 
+ Operation
+ 
+ </th>
+<th>
+ 
+ exception-safety
+ 
+ </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+ 
+ <code class="computeroutput">rtree()</code>
+ 
+ </td>
+<td>
+ 
+ nothrow
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">rtree(first,
+ last)</code>
+ 
+ </td>
+<td>
+ 
+ strong
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">~rtree()</code>
+ 
+ </td>
+<td>
+ 
+ nothrow
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">rtree(rtree const&)</code>
+ 
+ </td>
+<td>
+ 
+ strong
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">operator=(rtree const&)</code>
+ 
+ </td>
+<td>
+ 
+ strong
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">rtree(rtree &&)</code>
+ 
+ </td>
+<td>
+ 
+ nothrow
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">operator=(rtree &&)</code>
+ 
+ </td>
+<td>
+ 
+ nothrow or strong
+ [a]</a>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">insert(Value)</code>
+ 
+ </td>
+<td>
+ 
+ basic
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">insert(first,
+ last)</code>
+ 
+ </td>
+<td>
+ 
+ basic
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">remove(Value)</code>
+ 
+ </td>
+<td>
+ 
+ basic
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">remove(first,
+ last)</code>
+ 
+ </td>
+<td>
+ 
+ basic
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">spatial_query(...)</code>
+ 
+ </td>
+<td>
+ 
+ strong
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">nearest_query(...)</code>
+ 
+ </td>
+<td>
+ 
+ strong
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">size()</code>
+ 
+ </td>
+<td>
+ 
+ nothrow
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">empty()</code>
+ 
+ </td>
+<td>
+ 
+ nothrow
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">clear()</code>
+ 
+ </td>
+<td>
+ 
+ nothrow
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">box()</code>
+ 
+ </td>
+<td>
+ 
+ nothrow
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">get_allocator()</code>
+ 
+ </td>
+<td>
+ 
+ nothrow
+ 
+ </td>
+</tr>
+</tbody>
+<tbody class="footnotes"><tr><td colspan="2"><div id="ftn.geometry_index.r_tree.exception_safety.f0" class="footnote">^[a]
+ nothrow - if allocators are equal, strong - if allocators aren't equal
+ </div></td></tr></tbody>
+</table></div>
+</div>
+<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<td align="left"></td>
+<td align="right"><div class="copyright-footer">Copyright © 2011, 2012 Adam Wulkiewicz Copyright © 2008 Federico J. Fernandez
+ Distributed under 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)
+ 
+</div></td>
+</tr></table>
+<hr>
+<div class="spirit-nav">
+<a accesskey="p" href="nearest_neighbours_queries.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a>
+</div>
+</body>
+</html>

Modified: sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/nearest_neighbours_queries.html
==============================================================================
--- sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/nearest_neighbours_queries.html (original)
+++ sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/nearest_neighbours_queries.html 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -7,6 +7,7 @@
<link rel="home" href="../../index.html" title="Chapter 1. Geometry Index">
<link rel="up" href="../r_tree.html" title="R-tree">
<link rel="prev" href="spatial_queries.html" title="Spatial queries">
+<link rel="next" href="exception_safety.html" title="Exception safety">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -19,7 +20,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="spatial_queries.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a>
+<a accesskey="p" href="spatial_queries.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="exception_safety.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/next.png" alt="Next"></a>
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
@@ -52,20 +53,20 @@
 
<pre class="programlisting">std::vector<Value> returned_values;
<a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_point.html" target="_top">Point</a> pt(...);
-rt.nearest(pt, k, std::back_inserter(returned_values));
+rt.nearest_query(pt, k, std::back_inserter(returned_values));
</pre>

 Function call
 
<pre class="programlisting">std::vector<Value> returned_values;
<a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_point.html" target="_top">Point</a> pt(...);
-index::nearest(rt, pt, k, std::back_inserter(returned_values));
+index::nearest_query(rt, pt, k, std::back_inserter(returned_values));
</pre>

 Use of <code class="computeroutput">operator |</code>
 
<pre class="programlisting">Point pt(...);
-BOOST_FOREACH(Value & v, rt | index::nearest_filtered(pt, k))
+BOOST_FOREACH(Value & v, rt | index::adaptors::nearest_queried(pt, k))
 ; // do something with v
</pre>
</div>
@@ -84,14 +85,14 @@
 
<pre class="programlisting">Value returned_value;
<a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_point.html" target="_top">Point</a> pt(...);
-size_t n = rt.nearest(pt, returned_value);
+size_t n = rt.nearest_query(pt, returned_value);
</pre>

 Function call
 
<pre class="programlisting">Value Value returned_value;
<a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_point.html" target="_top">Point</a> pt(...);
-size_t n = index::nearest(rt, pt, returned_value);
+size_t n = index::nearest_query(rt, pt, returned_value);
</pre>
</div>
<div class="section">
@@ -109,19 +110,19 @@
<a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_point.html" target="_top">Point</a> pt(...);

/* default - without bounds */
-index::nearest(rt, pt, k, std::back_inserter(returned_values));
+index::nearest_query(rt, pt, k, std::back_inserter(returned_values));

/* same as default */
-index::nearest(rt, index::unbounded(pt), k, std::back_inserter(returned_values));
+index::nearest_query(rt, index::unbounded(pt), k, std::back_inserter(returned_values));

/* distance must be greater than or equal to 10 */
-index::nearest(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values));
+index::nearest_query(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values));

/* distance must be lesser than or equal to 500 */
-index::nearest(rt, index::max_bounded(pt, 500), k, std::back_inserter(returned_values));
+index::nearest_query(rt, index::max_bounded(pt, 500), k, std::back_inserter(returned_values));

/* distance must be between 10 and 500 */
-index::nearest(rt, index::bounded(pt, 10, 500), k, std::back_inserter(returned_values));
+index::nearest_query(rt, index::bounded(pt, 10, 500), k, std::back_inserter(returned_values));
</pre>

 Furthermore, it's possible to define if the closest, furthest or centroidal
@@ -133,19 +134,19 @@

/* default - distance between Indexable's closest point and a query point
must be greater than 10 */
-index::nearest(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values));
+index::nearest_query(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values));

/* same as default - distance between Indexable's closest point and a query point
must be greater than 10 */
-index::nearest(rt, index::min_bounded(pt, index::to_nearest(10)), k, std::back_inserter(returned_values));
+index::nearest_query(rt, index::min_bounded(pt, index::to_nearest(10)), k, std::back_inserter(returned_values));

/* distance between Indexable's furthest point and a query point
must be greater than 10 */
-index::nearest(rt, index::min_bounded(pt, index::to_furthest(10)), k, std::back_inserter(returned_values));
+index::nearest_query(rt, index::min_bounded(pt, index::to_furthest(10)), k, std::back_inserter(returned_values));

/* distance between Indexable's centroid and a query point
must be greater than 10 */
-index::nearest(rt, index::min_bounded(pt, index::to_centroid(10)), k, std::back_inserter(returned_values));
+index::nearest_query(rt, index::min_bounded(pt, index::to_centroid(10)), k, std::back_inserter(returned_values));
</pre>
</div>
<div class="section">
@@ -163,11 +164,11 @@
<a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_point.html" target="_top">Point</a> pt(...);
<a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_box.html" target="_top">Box</a> b(...);

-size_t n1 = rt.nearest(index::bounded(pt, index::to_furthest(1), 10), index::intersects(b), returned_value);
+size_t n1 = rt.nearest_query(index::bounded(pt, index::to_furthest(1), 10), index::intersects(b), returned_value);

-size_t n2 = index::nearest(rt, pt, k, index::within(b), std::back_inserter(returned_values));
+size_t n2 = index::nearest_query(rt, pt, k, index::within(b), std::back_inserter(returned_values));

-BOOST_FOREACH(Value & v, rt | index::nearest_filtered(pt, k, index::covered_by(b)))
+BOOST_FOREACH(Value & v, rt | index::adaptors::nearest_queried(pt, k, index::covered_by(b)))
 ; // do something with v
</pre>
</div>
@@ -182,7 +183,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="spatial_queries.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a>
+<a accesskey="p" href="spatial_queries.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="exception_safety.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/next.png" alt="Next"></a>
</div>
</body>
</html>

Modified: sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/rtree_quickstart.html
==============================================================================
--- sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/rtree_quickstart.html (original)
+++ sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/rtree_quickstart.html 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -7,7 +7,7 @@
<link rel="home" href="../../index.html" title="Chapter 1. Geometry Index">
<link rel="up" href="../r_tree.html" title="R-tree">
<link rel="prev" href="introduction.html" title="Introduction">
-<link rel="next" href="r_tree_creation.html" title="R-tree creation">
+<link rel="next" href="creation_and_modification.html" title="Creation and modification">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="introduction.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="r_tree_creation.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="introduction.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="creation_and_modification.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/next.png" alt="Next"></a>
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
@@ -86,14 +86,14 @@

 

- There are various types of queries that may be performed, they can be even
- combined together in one call. For simplicity, default one is used.
+ There are various types of spatial queries that may be performed, they can
+ be even combined together in one call. For simplicity, default one is used.
 


<pre class="programlisting">// find values intersecting a box
std::vector<value> result;
-rtree.query(b, std::back_inserter(result));
+rtree.spatial_query(b, std::back_inserter(result));
</pre>

 
@@ -103,7 +103,7 @@


<pre class="programlisting">// find 5 nearest values to a point
-rtree.nearest(point(0, 0), 5, std::back_inserter(result));
+rtree.nearest_query(point(0, 0), 5, std::back_inserter(result));
</pre>

 
@@ -126,7 +126,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="introduction.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="r_tree_creation.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="introduction.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="creation_and_modification.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/next.png" alt="Next"></a>
</div>
</body>
</html>

Modified: sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/spatial_queries.html
==============================================================================
--- sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/spatial_queries.html (original)
+++ sandbox-branches/geometry/index_dev/doc/html/geometry_index/r_tree/spatial_queries.html 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
<link rel="home" href="../../index.html" title="Chapter 1. Geometry Index">
<link rel="up" href="../r_tree.html" title="R-tree">
-<link rel="prev" href="r_tree_creation.html" title="R-tree creation">
+<link rel="prev" href="creation_and_modification.html" title="Creation and modification">
<link rel="next" href="nearest_neighbours_queries.html" title="Nearest neighbours queries">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="r_tree_creation.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="nearest_neighbours_queries.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="creation_and_modification.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="nearest_neighbours_queries.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/next.png" alt="Next"></a>
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
@@ -46,20 +46,20 @@
 
<pre class="programlisting">std::vector<Value> returned_values;
<a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_box.html" target="_top">Box</a> box_region(...);
-rt.query(box_region, std::back_inserter(returned_values));
+rt.spatial_query(box_region, std::back_inserter(returned_values));
</pre>

 Function call
 
<pre class="programlisting">std::vector<Value> returned_values;
<a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_box.html" target="_top">Box</a> box_region(...);
-index::query(rt, box_region, std::back_inserter(returned_values));
+index::spatial_query(rt, box_region, std::back_inserter(returned_values));
</pre>

 Use of pipe operator generating a range
 
<pre class="programlisting">Box box_region(...);
-BOOST_FOREACH(Value & v, rt | index::query_filtered(box_region))
+BOOST_FOREACH(Value & v, rt | index::adaptors::spatial_queried(box_region))
 ; // do something with v
</pre>
</div>
@@ -75,7 +75,7 @@
 algorithms.
 
<pre class="programlisting">rt.query(box, std::back_inserter(result)); // default case - intersects
-rt.query(index::intersects(box), std::back_inserter(result)); // same as default
+rt.query(index::intersects(box), std::back_inserter(result)); // the same as default
rt.query(index::covered_by(box), std::back_inserter(result));
rt.query(index::disjont(box), std::back_inserter(result));
rt.query(index::overlaps(box), std::back_inserter(result));
@@ -84,23 +84,21 @@

 All predicates may be negated, e.g.:
 
-<pre class="programlisting">rt.query(index::not_intersects(box), std::back_inserter(result));
-// or
-rt.query(!index::intersects(box), std::back_inserter(result));
+<pre class="programlisting">rt.spatial_query(!index::intersects(box), std::back_inserter(result));
// the same as
-rt.query(index::disjoint(box), std::back_inserter(result));
+rt.spatial_query(index::disjoint(box), std::back_inserter(result));
</pre>

 It's possible to use some number of predicates by passing <code class="computeroutput">std::pair<Pred1, Pred2></code>
 
-<pre class="programlisting">rt.query(
+<pre class="programlisting">rt.spatial_query(
 std::make_pair(index::intersects(box1), !index::within(box2))
 , std::back_inserter(result));
</pre>

 or <code class="computeroutput">boost::tuple<Pred1, Pred2, Pred3, ...></code>
 
-<pre class="programlisting">rt.query(
+<pre class="programlisting">rt.spatial_query(
 boost::make_tuple(
 index::intersects(box1), !index::within(box2), index::overlaps(box3))
 , std::back_inserter(result));
@@ -116,9 +114,9 @@

// ...

-rt.query(
+rt.spatial_query(
 boost::make_pair(index::intersects(box), index::value(fun))
- , std::back_inserter(result));
+, std::back_inserter(result));
</pre>
</div>
</div>
@@ -132,7 +130,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="r_tree_creation.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="nearest_neighbours_queries.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="creation_and_modification.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../r_tree.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="nearest_neighbours_queries.html"><img src="http://www.boost.org/doc/libs/release/doc/src/images/next.png" alt="Next"></a>
</div>
</body>
</html>

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-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -45,16 +45,18 @@
<dd><dl>
<dt>Introduction</dt>
<dt>Quick Start</dt>
-<dt>R-tree creation</dt>
+<dt><a href="geometry_index/r_tree/creation_and_modification.html">Creation
+ and modification</a></dt>
<dt>Spatial queries</dt>
<dt><a href="geometry_index/r_tree/nearest_neighbours_queries.html">Nearest
neighbours queries</a></dt>
+<dt>Exception safety</dt>
</dl></dd>
</dl>
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left">Last revised: September 04, 2012 at 18:00:33 GMT</td>
+<td align="left">Last revised: November 14, 2012 at 23:30:31 GMT</td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>

Modified: sandbox-branches/geometry/index_dev/doc/rtree.qbk
==============================================================================
--- sandbox-branches/geometry/index_dev/doc/rtree.qbk (original)
+++ sandbox-branches/geometry/index_dev/doc/rtree.qbk 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -13,7 +13,8 @@
[include rtree/introduction.qbk]
[include rtree/quickstart.qbk]
[include rtree/creation.qbk]
-[include rtree/query.qbk]
-[include rtree/nearest.qbk]
+[include rtree/spatial_query.qbk]
+[include rtree/nearest_query.qbk]
+[include rtree/exception_safety.qbk]

[endsect]

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-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -8,19 +8,19 @@
 http://www.boost.org/LICENSE_1_0.txt)
=============================================================================/]

-[section R-tree creation]
+[section Creation and modification]

-[section R-tree template parameters]
+[section Template parameters]

__rtree__ has 4 parameters:

 rtree<Value, Parameters, Translator, Allocator>

-* `Value` - type of object which will be stored in the container.
+* `__value__` - type of object which will be stored in the container.
* `Parameters` - compile-time parameters, e.g. inserting/splitting
 algorithm with min and max nodes' elements numbers.
-* `Translator` - type of object translating `Value` objects to
- `Indexable` objects (`__point__` or `__box__`) which __rtree__ can handle.
+* `__translator__` - type of object translating `Value` objects to
+ `__indexable__` objects (`__point__` or `__box__`) which __rtree__ can handle.
* `Allocator` - the allocator.

[endsect]
@@ -68,6 +68,38 @@

[endsect]

+[section Inserting and splitting algorithms (run-time)]
+
+By default splitting algorithm parameters are passed to the __rtree__ in compile time.
+To use run-time versions of the __rtree__ one may pass parameters defined in index::runtime
+namespace.
+
+ // linear
+ index::rtree<__value__, index::runtime::linear> rt(index::runtime::linear(32, 8));
+ // quadratic
+ index::rtree<__value__, index::runtime::quadratic> rt(index::runtime::quadratic(32, 8));
+ // rstar
+ index::rtree<__value__, index::runtime::rstar> rt(index::runtime::rstar(32, 8));
+
+[endsect]
+
+[section Copying and moving]
+
+The __rtree__ is copyable and movable container. Move semantics is implemented using Boost.Move library
+which also supports compilers not supporting rvalue references.
+
+ index::rtree< __value__, index::quadratic<32, 8> > rt1;
+ // copy constructor
+ index::rtree< __value__, index::quadratic<32, 8> > rt2;
+ // copy assignment
+ rt2 = r1;
+ // move constructor
+ index::rtree< __value__, index::quadratic<32, 8> > rt3(boost::move(rt1));
+ // move assignment
+ rt3 = boost::move(rt2);
+
+[endsect]
+
[section Inserting and removing Values]

Following code creates an __rtree__ using quadratic algorithm.
@@ -92,4 +124,4 @@

[endsect]

-[endsect] [/ R-tree creation /]
+[endsect] [/ Creation and modification /]

Added: sandbox-branches/geometry/index_dev/doc/rtree/exception_safety.qbk
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_dev/doc/rtree/exception_safety.qbk 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -0,0 +1,40 @@
+[/============================================================================
+ Boost.Geometry Index
+
+ Copyright (c) 2011-2012 Adam Wulkiewicz.
+
+ 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)
+=============================================================================/]
+
+[section Exception safety]
+
+In order to be exception-safe the __rtree__ requires:
+
+* Nonthrowing copy constructor of the `CoordinateType` used in the `__indexable__`,
+* Nonthrowing destructor of the `__value__`.
+
+[table
+[[Operation] [exception-safety]]
+[[`rtree()`] [ /nothrow/ ]]
+[[`rtree(first, last)`] [ *strong* ]]
+[[`~rtree()`] [ /nothrow/ ]]
+[[`rtree(rtree const&)`] [ *strong* ]]
+[[`operator=(rtree const&)`] [ *strong* ]]
+[[`rtree(rtree &&)`] [ /nothrow/ ]]
+[[`operator=(rtree &&)`] [ /nothrow/ or *strong* [footnote /nothrow/ - if allocators are equal, *strong* - if allocators aren't equal ]]]
+[[`insert(__value__)`] [ basic ]]
+[[`insert(first, last)`] [ basic ]]
+[[`remove(__value__)`] [ basic ]]
+[[`remove(first, last)`] [ basic ]]
+[[`spatial_query(...)`] [ *strong* ]]
+[[`nearest_query(...)`] [ *strong* ]]
+[[`size()`] [ /nothrow/ ]]
+[[`empty()`] [ /nothrow/ ]]
+[[`clear()`] [ /nothrow/ ]]
+[[`box()`] [ /nothrow/ ]]
+[[`get_allocator()`] [ /nothrow/ ]]
+]
+
+[endsect] [/Exception safety/]

Deleted: sandbox-branches/geometry/index_dev/doc/rtree/nearest.qbk
==============================================================================
--- sandbox-branches/geometry/index_dev/doc/rtree/nearest.qbk 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
+++ (empty file)
@@ -1,126 +0,0 @@
-[/============================================================================
- Boost.Geometry Index
-
- Copyright (c) 2011-2012 Adam Wulkiewicz.
-
- 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)
-=============================================================================/]
-
-[section Nearest neighbours queries]
-
-[section k nearest neighbours]
-
-There are three ways of performing knn queries. Following queries returns
-k `__value__`s closest to some point in space. For `__box__`es
-`__indexable__`s the distance to the nearest point is calculated by default.
-
-Method call
-
- std::vector<__value__> returned_values;
- __point__ pt(...);
- rt.nearest(pt, k, std::back_inserter(returned_values));
-
-Function call
-
- std::vector<__value__> returned_values;
- __point__ pt(...);
- index::nearest(rt, pt, k, std::back_inserter(returned_values));
-
-Use of `operator |`
-
- __point__ pt(...);
- BOOST_FOREACH(__value__ & v, rt | index::nearest_filtered(pt, k))
- ; // do something with v
-
-[endsect]
-
-[section One nearest neighbour]
-
-Another type of nearest neighbour query is searching for the one closest `__value__`.
-If it is found, 1 is returned by the method or function. This kind of query
-has only two forms.
-
-Method call
-
- __value__ returned_value;
- __point__ pt(...);
- size_t n = rt.nearest(pt, returned_value);
-
-Function call
-
- __value__ Value returned_value;
- __point__ pt(...);
- size_t n = index::nearest(rt, pt, returned_value);
-
-[endsect]
-
-[section Distances predicates]
-
-It is possible to define if calculated distance between query point and `__value__` should be
-greater, lesser or between some other distances. Those are called `DistancesPredicate`s and
-may be defined as follows.
-
- std::vector<__Value__> returned_values;
- __point__ pt(...);
-
- /* default - without bounds */
- index::nearest(rt, pt, k, std::back_inserter(returned_values));
-
- /* same as default */
- index::nearest(rt, index::unbounded(pt), k, std::back_inserter(returned_values));
-
- /* distance must be greater than or equal to 10 */
- index::nearest(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values));
-
- /* distance must be lesser than or equal to 500 */
- index::nearest(rt, index::max_bounded(pt, 500), k, std::back_inserter(returned_values));
-
- /* distance must be between 10 and 500 */
- index::nearest(rt, index::bounded(pt, 10, 500), k, std::back_inserter(returned_values));
-
-Furthermore, it's possible to define if the closest, furthest or centroidal point of the
-non-point `__indexable__` should be taken into account in the routine calculating distance.
-
- std::vector<__value__> returned_values;
- __point__ pt(...);
-
- /* default - distance between Indexable's closest point and a query point
- must be greater than 10 */
- index::nearest(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values));
-
- /* same as default - distance between Indexable's closest point and a query point
- must be greater than 10 */
- index::nearest(rt, index::min_bounded(pt, index::to_nearest(10)), k, std::back_inserter(returned_values));
-
- /* distance between Indexable's furthest point and a query point
- must be greater than 10 */
- index::nearest(rt, index::min_bounded(pt, index::to_furthest(10)), k, std::back_inserter(returned_values));
-
- /* distance between Indexable's centroid and a query point
- must be greater than 10 */
- index::nearest(rt, index::min_bounded(pt, index::to_centroid(10)), k, std::back_inserter(returned_values));
-
-[endsect]
-
-[section Using spatial predicates]
-
-It is possible to use spatial predicates described before in nearest neighbours queries.
-
- __value__ returned_value;
- std::vector<__value__> returned_values;
-
- __point__ pt(...);
- __box__ b(...);
-
- size_t n1 = rt.nearest(index::bounded(pt, index::to_furthest(1), 10), index::intersects(b), returned_value);
-
- size_t n2 = index::nearest(rt, pt, k, index::within(b), std::back_inserter(returned_values));
-
- BOOST_FOREACH(Value & v, rt | index::nearest_filtered(pt, k, index::covered_by(b)))
- ; // do something with v
-
-[endsect]
-
-[endsect] [/ Nearest neighbours queries /]

Added: sandbox-branches/geometry/index_dev/doc/rtree/nearest_query.qbk
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_dev/doc/rtree/nearest_query.qbk 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -0,0 +1,126 @@
+[/============================================================================
+ Boost.Geometry Index
+
+ Copyright (c) 2011-2012 Adam Wulkiewicz.
+
+ 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)
+=============================================================================/]
+
+[section Nearest neighbours queries]
+
+[section k nearest neighbours]
+
+There are three ways of performing knn queries. Following queries returns
+k `__value__`s closest to some point in space. For `__box__`es
+`__indexable__`s the distance to the nearest point is calculated by default.
+
+Method call
+
+ std::vector<__value__> returned_values;
+ __point__ pt(...);
+ rt.nearest_query(pt, k, std::back_inserter(returned_values));
+
+Function call
+
+ std::vector<__value__> returned_values;
+ __point__ pt(...);
+ index::nearest_query(rt, pt, k, std::back_inserter(returned_values));
+
+Use of `operator |`
+
+ __point__ pt(...);
+ BOOST_FOREACH(__value__ & v, rt | index::adaptors::nearest_queried(pt, k))
+ ; // do something with v
+
+[endsect]
+
+[section One nearest neighbour]
+
+Another type of nearest neighbour query is searching for the one closest `__value__`.
+If it is found, 1 is returned by the method or function. This kind of query
+has only two forms.
+
+Method call
+
+ __value__ returned_value;
+ __point__ pt(...);
+ size_t n = rt.nearest_query(pt, returned_value);
+
+Function call
+
+ __value__ Value returned_value;
+ __point__ pt(...);
+ size_t n = index::nearest_query(rt, pt, returned_value);
+
+[endsect]
+
+[section Distances predicates]
+
+It is possible to define if calculated distance between query point and `__value__` should be
+greater, lesser or between some other distances. Those are called `DistancesPredicate`s and
+may be defined as follows.
+
+ std::vector<__Value__> returned_values;
+ __point__ pt(...);
+
+ /* default - without bounds */
+ index::nearest_query(rt, pt, k, std::back_inserter(returned_values));
+
+ /* same as default */
+ index::nearest_query(rt, index::unbounded(pt), k, std::back_inserter(returned_values));
+
+ /* distance must be greater than or equal to 10 */
+ index::nearest_query(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values));
+
+ /* distance must be lesser than or equal to 500 */
+ index::nearest_query(rt, index::max_bounded(pt, 500), k, std::back_inserter(returned_values));
+
+ /* distance must be between 10 and 500 */
+ index::nearest_query(rt, index::bounded(pt, 10, 500), k, std::back_inserter(returned_values));
+
+Furthermore, it's possible to define if the closest, furthest or centroidal point of the
+non-point `__indexable__` should be taken into account in the routine calculating distance.
+
+ std::vector<__value__> returned_values;
+ __point__ pt(...);
+
+ /* default - distance between Indexable's closest point and a query point
+ must be greater than 10 */
+ index::nearest_query(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values));
+
+ /* same as default - distance between Indexable's closest point and a query point
+ must be greater than 10 */
+ index::nearest_query(rt, index::min_bounded(pt, index::to_nearest(10)), k, std::back_inserter(returned_values));
+
+ /* distance between Indexable's furthest point and a query point
+ must be greater than 10 */
+ index::nearest_query(rt, index::min_bounded(pt, index::to_furthest(10)), k, std::back_inserter(returned_values));
+
+ /* distance between Indexable's centroid and a query point
+ must be greater than 10 */
+ index::nearest_query(rt, index::min_bounded(pt, index::to_centroid(10)), k, std::back_inserter(returned_values));
+
+[endsect]
+
+[section Using spatial predicates]
+
+It is possible to use spatial predicates described before in nearest neighbours queries.
+
+ __value__ returned_value;
+ std::vector<__value__> returned_values;
+
+ __point__ pt(...);
+ __box__ b(...);
+
+ size_t n1 = rt.nearest_query(index::bounded(pt, index::to_furthest(1), 10), index::intersects(b), returned_value);
+
+ size_t n2 = index::nearest_query(rt, pt, k, index::within(b), std::back_inserter(returned_values));
+
+ BOOST_FOREACH(Value & v, rt | index::adaptors::nearest_queried(pt, k, index::covered_by(b)))
+ ; // do something with v
+
+[endsect]
+
+[endsect] [/ Nearest neighbours queries /]

Deleted: sandbox-branches/geometry/index_dev/doc/rtree/query.qbk
==============================================================================
--- sandbox-branches/geometry/index_dev/doc/rtree/query.qbk 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
+++ (empty file)
@@ -1,86 +0,0 @@
-[/============================================================================
- Boost.Geometry Index
-
- Copyright (c) 2011-2012 Adam Wulkiewicz.
-
- 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)
-=============================================================================/]
-
-[section Spatial queries]
-
-[section Basic queries]
-
-There are three ways to perform a spatial query. Following queries returns
-`__value__`s intersecting some box_region.
-
-Method call
-
- std::vector<__value__> returned_values;
- __box__ box_region(...);
- rt.query(box_region, std::back_inserter(returned_values));
-
-Function call
-
- std::vector<__value__> returned_values;
- __box__ box_region(...);
- index::query(rt, box_region, std::back_inserter(returned_values));
-
-Use of pipe operator generating a range
-
- __box__ box_region(...);
- BOOST_FOREACH(__value__ & v, rt | index::query_filtered(box_region))
- ; // do something with v
-[endsect]
-
-[section Spatial predicates]
-
-It is possible to define other relations between queried `__value__`s and region/regions
-of interest. Names of predicates corresponds to names of __boost_geometry__ algorithms.
-
- rt.query(box, std::back_inserter(result)); // default case - intersects
- rt.query(index::intersects(box), std::back_inserter(result)); // same as default
- rt.query(index::covered_by(box), std::back_inserter(result));
- rt.query(index::disjont(box), std::back_inserter(result));
- rt.query(index::overlaps(box), std::back_inserter(result));
- rt.query(index::within(box), std::back_inserter(result));
-
-All predicates may be negated, e.g.:
-
- rt.query(index::not_intersects(box), std::back_inserter(result));
- // or
- rt.query(!index::intersects(box), std::back_inserter(result));
- // the same as
- rt.query(index::disjoint(box), std::back_inserter(result));
-
-It's possible to use some number of predicates by passing `std::pair<Pred1, Pred2>`
-
- rt.query(
- std::make_pair(index::intersects(box1), !index::within(box2))
- , std::back_inserter(result));
-
-or `boost::tuple<Pred1, Pred2, Pred3, ...>`
-
- rt.query(
- boost::make_tuple(
- index::intersects(box1), !index::within(box2), index::overlaps(box3))
- , std::back_inserter(result));
-
-There is also a unique predicate `index::value(...)` taking user-defined function/functor
-which checks if `__value__` should be returned by the query.
-
- bool fun(__value__ const& v)
- {
- return v.is_red();
- }
-
- // ...
-
- rt.query(
- boost::make_pair(index::intersects(box), index::value(fun))
- , std::back_inserter(result));
-
-[endsect]
-
-[endsect] [/ Spatial queries /]

Modified: sandbox-branches/geometry/index_dev/doc/rtree/quickstart.qbk
==============================================================================
--- sandbox-branches/geometry/index_dev/doc/rtree/quickstart.qbk (original)
+++ sandbox-branches/geometry/index_dev/doc/rtree/quickstart.qbk 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -31,14 +31,14 @@

[rtree_quickstart_insert]

-There are various types of queries that may be performed, they can be even combined together
+There are various types of spatial queries that may be performed, they can be even combined together
in one call. For simplicity, default one is used.

-[rtree_quickstart_query]
+[rtree_quickstart_spatial_query]

Default k-nearest neighbors query may be performed as follows.

-[rtree_quickstart_nearest]
+[rtree_quickstart_nearest_query]

[h3 More]
More information about the R-tree implementation, other algorithms and queries may be found in

Added: sandbox-branches/geometry/index_dev/doc/rtree/spatial_query.qbk
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_dev/doc/rtree/spatial_query.qbk 2012-11-14 18:35:14 EST (Wed, 14 Nov 2012)
@@ -0,0 +1,84 @@
+[/============================================================================
+ Boost.Geometry Index
+
+ Copyright (c) 2011-2012 Adam Wulkiewicz.
+
+ 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)
+=============================================================================/]
+
+[section Spatial queries]
+
+[section Basic queries]
+
+There are three ways to perform a spatial query. Following queries returns
+`__value__`s intersecting some box_region.
+
+Method call
+
+ std::vector<__value__> returned_values;
+ __box__ box_region(...);
+ rt.spatial_query(box_region, std::back_inserter(returned_values));
+
+Function call
+
+ std::vector<__value__> returned_values;
+ __box__ box_region(...);
+ index::spatial_query(rt, box_region, std::back_inserter(returned_values));
+
+Use of pipe operator generating a range
+
+ __box__ box_region(...);
+ BOOST_FOREACH(__value__ & v, rt | index::adaptors::spatial_queried(box_region))
+ ; // do something with v
+[endsect]
+
+[section Spatial predicates]
+
+It is possible to define other relations between queried `__value__`s and region/regions
+of interest. Names of predicates corresponds to names of __boost_geometry__ algorithms.
+
+ rt.query(box, std::back_inserter(result)); // default case - intersects
+ rt.query(index::intersects(box), std::back_inserter(result)); // the same as default
+ rt.query(index::covered_by(box), std::back_inserter(result));
+ rt.query(index::disjont(box), std::back_inserter(result));
+ rt.query(index::overlaps(box), std::back_inserter(result));
+ rt.query(index::within(box), std::back_inserter(result));
+
+All predicates may be negated, e.g.:
+
+ rt.spatial_query(!index::intersects(box), std::back_inserter(result));
+ // the same as
+ rt.spatial_query(index::disjoint(box), std::back_inserter(result));
+
+It's possible to use some number of predicates by passing `std::pair<Pred1, Pred2>`
+
+ rt.spatial_query(
+ std::make_pair(index::intersects(box1), !index::within(box2))
+ , std::back_inserter(result));
+
+or `boost::tuple<Pred1, Pred2, Pred3, ...>`
+
+ rt.spatial_query(
+ boost::make_tuple(
+ index::intersects(box1), !index::within(box2), index::overlaps(box3))
+ , std::back_inserter(result));
+
+There is also a unique predicate `index::value(...)` taking user-defined function/functor
+which checks if `__value__` should be returned by the query.
+
+ bool fun(__value__ const& v)
+ {
+ return v.is_red();
+ }
+
+ // ...
+
+ rt.spatial_query(
+ boost::make_pair(index::intersects(box), index::value(fun))
+ , std::back_inserter(result));
+
+[endsect]
+
+[endsect] [/ Spatial queries /]

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