[Boost-commit] svn:boost r85617 - in trunk: boost/geometry/index libs/geometry/doc/html/img/index/rtree libs/geometry/doc/index

Subject: [Boost-commit] svn:boost r85617 - in trunk: boost/geometry/index libs/geometry/doc/html/img/index/rtree libs/geometry/doc/index
From: adam.wulkiewicz_at_[hidden]
Date: 2013-09-08 20:02:54

Author: awulkiew
Date: 2013-09-08 20:02:53 EDT (Sun, 08 Sep 2013)
New Revision: 85617
URL: http://svn.boost.org/trac/boost/changeset/85617

Log:
[geometry][index] docs updated.

Binary files modified: 
   trunk/libs/geometry/doc/html/img/index/rtree/build_non_ovl.png
   trunk/libs/geometry/doc/html/img/index/rtree/build_ovl.png
   trunk/libs/geometry/doc/html/img/index/rtree/query_non_ovl.png
   trunk/libs/geometry/doc/html/img/index/rtree/query_ovl.png
Text files modified: 
   trunk/boost/geometry/index/rtree.hpp           |     4 ++++                                    
   trunk/libs/geometry/doc/index/introduction.qbk |    14 ++++++++++----                          
   2 files changed, 14 insertions(+), 4 deletions(-)

Modified: trunk/boost/geometry/index/rtree.hpp
==============================================================================
--- trunk/boost/geometry/index/rtree.hpp	Sun Sep  8 18:20:48 2013	(r85616)
+++ trunk/boost/geometry/index/rtree.hpp	2013-09-08 20:02:53 EDT (Sun, 08 Sep 2013)	(r85617)
@@ -1549,14 +1549,18 @@
 <b>Spatial predicates</b>
     
 Spatial predicates may be generated by one of the functions listed below:
+\li \c boost::geometry::index::contains(),
 \li \c boost::geometry::index::covered_by(),
+\li \c boost::geometry::index::covers(),
 \li \c boost::geometry::index::disjoint(),
 \li \c boost::geometry::index::intersects(),
 \li \c boost::geometry::index::overlaps(),
 \li \c boost::geometry::index::within(),
 
 It is possible to negate spatial predicates:
+\li <tt>! boost::geometry::index::contains()</tt>,
 \li <tt>! boost::geometry::index::covered_by()</tt>,
+\li <tt>! boost::geometry::index::covers()</tt>,
 \li <tt>! boost::geometry::index::disjoint()</tt>,
 \li <tt>! boost::geometry::index::intersects()</tt>,
 \li <tt>! boost::geometry::index::overlaps()</tt>,

Modified: trunk/libs/geometry/doc/html/img/index/rtree/build_non_ovl.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/libs/geometry/doc/html/img/index/rtree/build_ovl.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/libs/geometry/doc/html/img/index/rtree/query_non_ovl.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/libs/geometry/doc/html/img/index/rtree/query_ovl.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/libs/geometry/doc/index/introduction.qbk
==============================================================================
--- trunk/libs/geometry/doc/index/introduction.qbk	Sun Sep  8 18:20:48 2013	(r85616)
+++ trunk/libs/geometry/doc/index/introduction.qbk	2013-09-08 20:02:53 EDT (Sun, 08 Sep 2013)	(r85617)
@@ -49,7 +49,7 @@
 The examples of structures of trees created by use of different algorithms and exemplary operations times are presented below.
 
 [table
-[[]                         [Linear algorithm] [Quadratic algorithm] [R*-tree] [Packing algorithm (trunk)]]
+[[]                         [Linear algorithm] [Quadratic algorithm] [R*-tree] [Packing algorithm]]
 [[*Example structure*]      [[$img/index/rtree/linear.png]] [[$img/index/rtree/quadratic.png]] [[$img/index/rtree/rstar.png]] [[$img/index/rtree/bulk.png]]]
 [[*1M Values inserts*]      [1.76s] [2.47s] [6.19s] [1.67s]]
 [[*100k spatial queries*]   [2.21s] [0.51s] [0.12s] [0.07s]]
@@ -74,9 +74,11 @@
 
 * capable to store arbitrary __value__ type,
 * three different balancing algorithms - linear, quadratic or rstar,
+* creation using packing algorithm,
 * parameters (including maximal and minimal number of elements) may be passed as compile- or run-time parameters, in compile-time
   version nodes elements are stored in static-size containers,
 * advanced queries - e.g. search for 5 nearest Values to some point and intersecting some Geometry but not within the other one,
+* iterative queries - by use of iterators,
 * C++11 conformant: move semantics, stateful allocators,
 * capable to store __value__ type with no default constructor,
 * in-memory storage (shared memory by use of Boost.Interprocess allocator).
@@ -85,13 +87,17 @@
 
 Below you can find features that will (or probably will) be added in the future releases:
 
+[/ Done
 * rstar optimization (planned for release in Boost 1.55),
 * bulk loading (planned for release in Boost 1.55),
-* iterative queries - query iterators / type-erased query iterators (experimental),
+* 'reversed' spatial predicates or additional spatial predicates like contains(),
+* iterative queries - query iterators / type-erased query iterators,
+/]
 * path/ray query predicate - search for Values along Segment or LineString, closest to the starting point (experimental),
+* user-defined distance calculation in nearest() predicate,
+* serialization (experimental),
 * persistent storage.
-[/
-* 'reversed' spatial predicates or additional spatial predicates like contains(),
+[/ Maybe
 * other geometries as Values, e.g. NSpheres. Rings would probably require using move semantics instead of copying
 * bounding tree - rtree variation capable to use other Geometries as bounds, e.g. NSpheres, Rings/convex polygons/ (moving required), Capsules, Elipses, Variants etc.
 * moving instead of copying + optimizations for movable/nonthrowing/trivialy copied elements