|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r83077 - in sandbox-branches/geometry/index: boost/geometry/index boost/geometry/index/detail/rtree/visitors boost/geometry/index/translator doc doc/generated doc/html doc/html/geometry_index doc/html/geometry_index/r_tree doc/rtree doc/src/examples/rtree test/rtree
From: adam.wulkiewicz_at_[hidden]
Date: 2013-02-21 22:23:44
Author: awulkiew
Date: 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
New Revision: 83077
URL: http://svn.boost.org/trac/boost/changeset/83077
Log:
rtree predefined translator renamed to index::translator<>
index::translator::def<> renamed to index::translator<>
index::translator::index<> removed
translator helpers removed or moved to index::default::translator namespace
some unneeded includes removed
docs updated
Added:
sandbox-branches/geometry/index/boost/geometry/index/translator.hpp (contents, props changed)
sandbox-branches/geometry/index/doc/generated/translator.qbk (contents, props changed)
Removed:
sandbox-branches/geometry/index/boost/geometry/index/translator/
sandbox-branches/geometry/index/doc/generated/translator_def.qbk
sandbox-branches/geometry/index/doc/generated/translator_index.qbk
Properties modified:
sandbox-branches/geometry/index/doc/html/ (props changed)
Text files modified:
sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/children_box.hpp | 2
sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/copy.hpp | 2
sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/count.hpp | 2
sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/destroy.hpp | 2
sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/insert.hpp | 2
sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/is_leaf.hpp | 2
sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/nearest_query.hpp | 5
sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/remove.hpp | 2
sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp | 4
sandbox-branches/geometry/index/boost/geometry/index/rtree.hpp | 7
sandbox-branches/geometry/index/doc/generated/rtree.qbk | 4
sandbox-branches/geometry/index/doc/html/geometry_index/r_tree.html | 4
sandbox-branches/geometry/index/doc/html/geometry_index/r_tree/reference.html | 346 ++++++++++-----------------------------
sandbox-branches/geometry/index/doc/html/geometry_index/r_tree/rtree_examples.html | 2
sandbox-branches/geometry/index/doc/html/index.html | 2
sandbox-branches/geometry/index/doc/make_qbk.py | 6
sandbox-branches/geometry/index/doc/rtree/reference.qbk | 15
sandbox-branches/geometry/index/doc/src/examples/rtree/interprocess.cpp | 2
sandbox-branches/geometry/index/test/rtree/test_rtree.hpp | 52 +++---
19 files changed, 136 insertions(+), 327 deletions(-)
Modified: sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/children_box.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/children_box.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/children_box.hpp 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -11,8 +11,6 @@
#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_CHILDREN_BOX_HPP
#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_CHILDREN_BOX_HPP
-#include <boost/geometry/index/detail/rtree/node/node.hpp>
-
namespace boost { namespace geometry { namespace index {
namespace detail { namespace rtree { namespace visitors {
Modified: sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/copy.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/copy.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/copy.hpp 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -11,8 +11,6 @@
#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COPY_HPP
#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COPY_HPP
-#include <boost/geometry/index/detail/rtree/node/node.hpp>
-
namespace boost { namespace geometry { namespace index {
namespace detail { namespace rtree { namespace visitors {
Modified: sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/count.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/count.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/count.hpp 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -11,8 +11,6 @@
#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COUNT_HPP
#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COUNT_HPP
-#include <boost/geometry/index/detail/rtree/node/node.hpp>
-
namespace boost { namespace geometry { namespace index {
namespace detail { namespace rtree { namespace visitors {
Modified: sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/destroy.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/destroy.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/destroy.hpp 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -11,8 +11,6 @@
#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_DELETE_HPP
#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_DELETE_HPP
-#include <boost/geometry/index/detail/rtree/node/node.hpp>
-
namespace boost { namespace geometry { namespace index {
namespace detail { namespace rtree { namespace visitors {
Modified: sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/insert.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/insert.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/insert.hpp 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -13,8 +13,6 @@
#include <boost/geometry/index/detail/algorithms/content.hpp>
-#include <boost/geometry/index/detail/rtree/node/node.hpp>
-
namespace boost { namespace geometry { namespace index {
namespace detail { namespace rtree {
Modified: sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/is_leaf.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/is_leaf.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/is_leaf.hpp 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -11,8 +11,6 @@
#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_IS_LEAF_HPP
#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_IS_LEAF_HPP
-#include <boost/geometry/index/detail/rtree/node/node.hpp>
-
namespace boost { namespace geometry { namespace index {
namespace detail { namespace rtree { namespace visitors {
Modified: sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/nearest_query.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/nearest_query.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/nearest_query.hpp 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -11,11 +11,6 @@
#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_NEAREST_QUERY_HPP
#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_NEAREST_QUERY_HPP
-#include <boost/geometry/index/detail/distance_predicates.hpp>
-
-#include <boost/geometry/index/detail/rtree/node/node.hpp>
-#include <boost/geometry/index/translator/translator.hpp>
-
namespace boost { namespace geometry { namespace index {
namespace detail { namespace rtree { namespace visitors {
Modified: sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/remove.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/remove.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/remove.hpp 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -11,8 +11,6 @@
#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_REMOVE_HPP
#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_REMOVE_HPP
-#include <boost/geometry/index/detail/rtree/node/node.hpp>
-
#include <boost/geometry/index/detail/rtree/visitors/is_leaf.hpp>
#include <boost/geometry/algorithms/covered_by.hpp>
Modified: sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -11,10 +11,6 @@
#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_SPATIAL_QUERY_HPP
#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_SPATIAL_QUERY_HPP
-#include <boost/geometry/index/detail/predicates.hpp>
-
-#include <boost/geometry/index/detail/rtree/node/node.hpp>
-
namespace boost { namespace geometry { namespace index {
namespace detail { namespace rtree { namespace visitors {
Modified: sandbox-branches/geometry/index/boost/geometry/index/rtree.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/rtree.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/rtree.hpp 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -23,9 +23,10 @@
#include <boost/geometry/index/detail/assert.hpp>
-#include <boost/geometry/index/translator/translator.hpp>
#include <boost/geometry/index/detail/rtree/options.hpp>
+#include <boost/geometry/index/translator.hpp>
+
#include <boost/geometry/index/predicates.hpp>
#include <boost/geometry/index/distance_predicates.hpp>
#include <boost/geometry/index/detail/rtree/adaptors.hpp>
@@ -96,7 +97,7 @@
template <
typename Value,
typename Parameters,
- typename Translator = translator::def<Value>,
+ typename Translator = index::translator<Value>,
typename Allocator = std::allocator<Value>
>
class rtree
@@ -116,7 +117,7 @@
typedef typename allocator_type::size_type size_type;
/*! \brief The Indexable type to which Value is translated. */
- typedef typename translator::indexable_type<Translator>::type indexable_type;
+ typedef typename index::detail::translator::indexable_type<Translator>::type indexable_type;
/*! \brief The Box type used by the R-tree. */
typedef typename index::detail::default_box_type<indexable_type>::type bounds_type;
Added: sandbox-branches/geometry/index/boost/geometry/index/translator.hpp
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index/boost/geometry/index/translator.hpp 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -0,0 +1,208 @@
+// Boost.Geometry Index
+//
+// Copyright (c) 2011-2013 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)
+
+#ifndef BOOST_GEOMETRY_INDEX_TRANSLATOR_TRANSLATOR_HPP
+#define BOOST_GEOMETRY_INDEX_TRANSLATOR_TRANSLATOR_HPP
+
+// move index::translator::def<> to index::translator<>
+// make all index::translator<> methods static
+// remove translator::index
+// move helpers to index::default::translator
+
+//#include <boost/geometry/index/translator/def.hpp>
+//#include <boost/geometry/index/translator/index.hpp>
+
+#include <boost/mpl/assert.hpp>
+
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/index/detail/indexable.hpp>
+
+namespace boost { namespace geometry { namespace index {
+
+namespace detail { namespace translator {
+
+template <typename Geometry>
+struct indexable_not_found_error
+{
+ static const bool value = false;
+};
+template <>
+struct indexable_not_found_error<void>
+{
+ static const bool value = true;
+};
+
+template <typename Geometry, typename Tag>
+struct equals
+{
+ static bool apply(Geometry const& g1, Geometry const& g2)
+ {
+ return geometry::equals(g1, g2);
+ }
+};
+
+template <typename T>
+struct equals<T, void>
+{
+ static bool apply(T const& v1, T const& v2)
+ {
+ return v1 == v2;
+ }
+};
+
+}} // namespace detail::translator
+
+/*!
+\brief The default translator.
+
+It translates Value object to Indexable object. The default version handles Values which are Indexables.
+This translator is also specialized for std::pair<Indexable, Second> and boost::tuple<Indexable, ...>.
+
+\tparam Value The Value type which may be translated directly to the Indexable.
+*/
+template <typename Value>
+struct translator
+{
+ BOOST_MPL_ASSERT_MSG(
+ (!detail::translator::indexable_not_found_error<
+ typename detail::traits::indexable_type<Value>::type
+ >::value),
+ NOT_VALID_INDEXABLE_TYPE,
+ (Value)
+ );
+
+ typedef Value const& result_type;
+
+ result_type operator()(Value const& value) const
+ {
+ return value;
+ }
+
+ bool equals(Value const& v1, Value const& v2) const
+ {
+ return geometry::equals(v1, v2);
+ }
+};
+
+/*!
+\brief The default translator.
+
+This specialization translates from std::pair<Indexable, Second>.
+
+\tparam Indexable The Indexable type.
+\tparam Second The second type.
+*/
+template <typename Indexable, typename Second>
+struct translator< std::pair<Indexable, Second> >
+{
+ BOOST_MPL_ASSERT_MSG(
+ (!detail::translator::indexable_not_found_error<
+ typename detail::traits::indexable_type<Indexable>::type
+ >::value),
+ NOT_VALID_INDEXABLE_TYPE,
+ (Indexable)
+ );
+
+ typedef Indexable const& result_type;
+
+ result_type operator()(std::pair<Indexable, Second> const& value) const
+ {
+ return value.first;
+ }
+
+ bool equals(std::pair<Indexable, Second> const& v1, std::pair<Indexable, Second> const& v2) const
+ {
+ return geometry::equals(v1.first, v2.first)
+ &&
+ detail::translator::equals<
+ Second,
+ typename geometry::traits::tag<Second>::type
+ >::apply(v1.second, v2.second);
+ }
+};
+
+namespace detail { namespace translator {
+
+template <typename Tuple, size_t I, size_t N>
+struct compare_tuples
+{
+ inline static bool apply(Tuple const& t1, Tuple const& t2)
+ {
+ typedef typename boost::tuples::element<I, Tuple>::type T;
+ return detail::translator::equals<
+ T,
+ typename geometry::traits::tag<T>::type
+ >::apply(boost::get<I>(t1), boost::get<I>(t2))
+ &&
+ compare_tuples<Tuple, I+1, N>::apply(t1, t2);
+ }
+};
+
+template <typename Tuple, size_t I>
+struct compare_tuples<Tuple, I, I>
+{
+ inline static bool apply(Tuple const&, Tuple const&)
+ {
+ return true;
+ }
+};
+
+}} // namespace detail::translator
+
+/*!
+\brief The default translator.
+
+This specialization translates from boost::tuple<Indexable, ...>.
+
+\tparam Indexable The Indexable type.
+*/
+template <typename Indexable, typename T1, typename T2, typename T3, typename T4,
+ typename T5, typename T6, typename T7, typename T8, typename T9>
+struct translator< boost::tuple<Indexable, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
+{
+ typedef boost::tuple<Indexable, T1, T2, T3, T4, T5, T6, T7, T8, T9> value_type;
+
+ BOOST_MPL_ASSERT_MSG(
+ (!detail::translator::indexable_not_found_error<
+ typename detail::traits::indexable_type<Indexable>::type
+ >::value),
+ NOT_VALID_INDEXABLE_TYPE,
+ (Indexable)
+ );
+
+ typedef Indexable const& result_type;
+
+ result_type operator()(value_type const& value) const
+ {
+ return boost::get<0>(value);
+ }
+
+ bool equals(value_type const& v1, value_type const& v2) const
+ {
+ return detail::translator::compare_tuples<value_type, 0, boost::tuples::length<value_type>::value>
+ ::apply(v1, v2);
+ }
+};
+
+namespace detail { namespace translator {
+
+template <typename Translator>
+struct indexable_type
+{
+ typedef typename boost::remove_const<
+ typename boost::remove_reference<
+ typename Translator::result_type
+ >::type
+ >::type type;
+};
+
+}} // namespace detail::translator
+
+}}} // namespace boost::geometry::index
+
+#endif // BOOST_GEOMETRY_INDEX_TRANSLATOR_TRANSLATOR_HPP
Modified: sandbox-branches/geometry/index/doc/generated/rtree.qbk
==============================================================================
--- sandbox-branches/geometry/index/doc/generated/rtree.qbk (original)
+++ sandbox-branches/geometry/index/doc/generated/rtree.qbk 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -44,7 +44,7 @@
[pre
`template<``typename Value``,`
`typename Parameters``,`
- `typename Translator` = [^[link structboost_1_1geometry_1_1index_1_1translator_1_1def translator::def]]`<Value>``,`
+ `typename Translator` = [^[link structboost_1_1geometry_1_1index_1_1translator index::translator]]`<Value>``,`
`typename Allocator` = `std::allocator<Value>``>`
`class rtree`
`{`
@@ -69,7 +69,7 @@
[[[#classboost_1_1geometry_1_1index_1_1rtree_1adbc30a1fa986e2e856e0662111ac2d91] `translator_type`][Value to Indexable Translator type. ]]
[[[#classboost_1_1geometry_1_1index_1_1rtree_1a9d35bc38fa697c6f600548fb5b38807d] `allocator_type`][The type of allocator used by the container. ]]
[[[#classboost_1_1geometry_1_1index_1_1rtree_1a5c1a657074c527ed65f858c1ab6b36e6] `size_type`][Unsigned integral type used by the container. ]]
-[[[#classboost_1_1geometry_1_1index_1_1rtree_1ac011da09678f034a7fab487a9b973bfc] `indexable_type`][The Indexable type to which Value is translated. ]]
+[[[#classboost_1_1geometry_1_1index_1_1rtree_1a6533b05d4a2eea9d4a0033e192add466] `indexable_type`][The Indexable type to which Value is translated. ]]
[[[#classboost_1_1geometry_1_1index_1_1rtree_1a653555282525601512c3b1bed1e9590f] `bounds_type`][The Box type used by the R-tree. ]]
]
Added: sandbox-branches/geometry/index/doc/generated/translator.qbk
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index/doc/generated/translator.qbk 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -0,0 +1,31 @@
+[/ Generated by doxygen_xml2qbk, don't change, will be overwritten automatically]
+[/ Generated from xml/structboost_1_1geometry_1_1index_1_1translator.xml]
+[#structboost_1_1geometry_1_1index_1_1translator]
+[section:boost_geometry_index_translator boost::geometry::index::translator]
+
+'''<indexterm><primary>boost</primary></indexterm><indexterm><primary>geometry</primary></indexterm><indexterm><primary>index</primary></indexterm><indexterm><primary>translator</primary></indexterm>'''
+The default translator.
+
+[heading Description]
+It translates Value object to Indexable object. The default version handles Values which are Indexables. This translator is also specialized for std::pair<Indexable, Second> and boost::tuple<Indexable, ...>.
+
+[heading Header]
+`#include <boost/geometry/index/translator.hpp>`
+
+[heading Synopsis]
+[pre
+`template<``typename Value``>`
+`struct translator`
+`{`
+` // ...`
+`};`
+]
+
+[heading Template parameter(s)]
+[table
+[[Parameter] [Description]]
+[[`Value`][The Value type which may be translated directly to the Indexable. ]]
+]
+
+[endsect]
+
Deleted: sandbox-branches/geometry/index/doc/generated/translator_def.qbk
==============================================================================
--- sandbox-branches/geometry/index/doc/generated/translator_def.qbk 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
+++ (empty file)
@@ -1,31 +0,0 @@
-[/ Generated by doxygen_xml2qbk, don't change, will be overwritten automatically]
-[/ Generated from xml/structboost_1_1geometry_1_1index_1_1translator_1_1def.xml]
-[#structboost_1_1geometry_1_1index_1_1translator_1_1def]
-[section:boost_geometry_index_translator_def boost::geometry::index::translator::def]
-
-'''<indexterm><primary>boost</primary></indexterm><indexterm><primary>geometry</primary></indexterm><indexterm><primary>index</primary></indexterm><indexterm><primary>translator</primary></indexterm><indexterm><primary>def</primary></indexterm>'''
-The default translator.
-
-[heading Description]
-It translates Value object to Indexable object. The default version handles Values which are Indexables. This translator is also specialized for std::pair<Indexable, Second> and boost::tuple<Indexable, ...>.
-
-[heading Header]
-`#include <boost/geometry/index/translator/def.hpp>`
-
-[heading Synopsis]
-[pre
-`template<``typename Value``>`
-`struct def`
-`{`
-` // ...`
-`};`
-]
-
-[heading Template parameter(s)]
-[table
-[[Parameter] [Description]]
-[[`Value`][The Value type which may be translated directly to the Indexable. ]]
-]
-
-[endsect]
-
Deleted: sandbox-branches/geometry/index/doc/generated/translator_index.qbk
==============================================================================
--- sandbox-branches/geometry/index/doc/generated/translator_index.qbk 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
+++ (empty file)
@@ -1,55 +0,0 @@
-[/ Generated by doxygen_xml2qbk, don't change, will be overwritten automatically]
-[/ Generated from xml/classboost_1_1geometry_1_1index_1_1translator_1_1index.xml]
-[#classboost_1_1geometry_1_1index_1_1translator_1_1index]
-[section:boost_geometry_index_translator_index boost::geometry::index::translator::index]
-
-'''<indexterm><primary>boost</primary></indexterm><indexterm><primary>geometry</primary></indexterm><indexterm><primary>index</primary></indexterm><indexterm><primary>translator</primary></indexterm><indexterm><primary>index</primary></indexterm>'''
-The index translator.
-
-[heading Description]
-This translator translates from index of an element in an external Container to the Indexable. The container should have operator[](size\u005ftype) defined. Index translator uses [link structboost_1_1geometry_1_1index_1_1translator_1_1def translator::def]<...> to translate from Container::value\u005ftype to the Indexable which means that it can handle Indexables, std::pairs and boost::tuples stored in an external Container.
-
-[heading Header]
-`#include <boost/geometry/index/translator/index.hpp>`
-
-[heading Synopsis]
-[pre
-`template<``typename Container``>`
-`class index`
-`{`
-` // ...`
-`};`
-]
-
-[heading Template parameter(s)]
-[table
-[[Parameter] [Description]]
-[[`Container`][The Container type. ]]
-]
-
-[heading Constructor(s) and destructor]
-[table
-[[Function][Description]]
-[[[link classboost_1_1geometry_1_1index_1_1translator_1_1index_1a87e7e498c20aa3bf38e350a6ab19e736 `index(Container const &)`]][The constructor. ]]
-]
-
-[#classboost_1_1geometry_1_1index_1_1translator_1_1index_1a87e7e498c20aa3bf38e350a6ab19e736]
-[section index(Container const &)]
-The constructor.
-
-[heading Synopsis]
-[pre
-
-`index``(``Container const &` `c``)`
-]
-
-[heading Modifier(s)]
-``explicit ``[heading Parameter(s)]
-[table
-[[Type][Name][Description]]
-[[`Container const &`][ `c` ][The container which stores indexed values. ]]
-]
-[endsect]
-
-[endsect]
-
Modified: sandbox-branches/geometry/index/doc/html/geometry_index/r_tree.html
==============================================================================
--- sandbox-branches/geometry/index/doc/html/geometry_index/r_tree.html (original)
+++ sandbox-branches/geometry/index/doc/html/geometry_index/r_tree.html 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -77,14 +77,14 @@
related to the rtree</a></span></dt>
<dt><span class="section"><a href="r_tree/reference.html#geometry_index.r_tree.reference.parameters">R-tree
parameters (boost::geometry::index::)</a></span></dt>
+<dt><span class="section"><a href="r_tree/reference.html#geometry_index.r_tree.reference.translator">Translator
+ (boost::geometry::index::translator)</a></span></dt>
<dt><span class="section"><a href="r_tree/reference.html#geometry_index.r_tree.reference.group__predicates">Predicates
(boost::geometry::index::)</a></span></dt>
<dt><span class="section"><a href="r_tree/reference.html#geometry_index.r_tree.reference.group__nearest__relations">Nearest
relations (boost::geometry::index::)</a></span></dt>
<dt><span class="section"><a href="r_tree/reference.html#geometry_index.r_tree.reference.group__adaptors">Adaptors
(boost::geometry::index::adaptors::)</a></span></dt>
-<dt><span class="section"><a href="r_tree/reference.html#geometry_index.r_tree.reference.translators">Translators
- (boost::geometry::index::translators::)</a></span></dt>
<dt><span class="section"><a href="r_tree/reference.html#geometry_index.r_tree.reference.group__inserters">Inserters
(boost::geometry::index::)</a></span></dt>
</dl></dd>
Modified: sandbox-branches/geometry/index/doc/html/geometry_index/r_tree/reference.html
==============================================================================
--- sandbox-branches/geometry/index/doc/html/geometry_index/r_tree/reference.html (original)
+++ sandbox-branches/geometry/index/doc/html/geometry_index/r_tree/reference.html 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -31,14 +31,14 @@
related to the rtree</a></span></dt>
<dt><span class="section"><a href="reference.html#geometry_index.r_tree.reference.parameters">R-tree
parameters (boost::geometry::index::)</a></span></dt>
+<dt><span class="section"><a href="reference.html#geometry_index.r_tree.reference.translator">Translator
+ (boost::geometry::index::translator)</a></span></dt>
<dt><span class="section"><a href="reference.html#geometry_index.r_tree.reference.group__predicates">Predicates
(boost::geometry::index::)</a></span></dt>
<dt><span class="section"><a href="reference.html#geometry_index.r_tree.reference.group__nearest__relations">Nearest
relations (boost::geometry::index::)</a></span></dt>
<dt><span class="section"><a href="reference.html#geometry_index.r_tree.reference.group__adaptors">Adaptors
(boost::geometry::index::adaptors::)</a></span></dt>
-<dt><span class="section"><a href="reference.html#geometry_index.r_tree.reference.translators">Translators
- (boost::geometry::index::translators::)</a></span></dt>
<dt><span class="section"><a href="reference.html#geometry_index.r_tree.reference.group__inserters">Inserters
(boost::geometry::index::)</a></span></dt>
</dl></div>
@@ -47,7 +47,7 @@
<a name="geometry_index.r_tree.reference.boost_geometry_index_rtree"></a><a name="classboost_1_1geometry_1_1index_1_1rtree"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.boost_geometry_index_rtree" title="boost::geometry::index::rtree">boost::geometry::index::rtree</a>
</h4></div></div></div>
<p>
- <a class="indexterm" name="id889982"></a><a class="indexterm" name="id889986"></a><a class="indexterm" name="id889991"></a><a class="indexterm" name="id889996"></a>
+ <a class="indexterm" name="id917422"></a><a class="indexterm" name="id917426"></a><a class="indexterm" name="id917431"></a><a class="indexterm" name="id917436"></a>
The R-tree spatial index.
</p>
<h6>
@@ -125,7 +125,7 @@
</h6>
<pre class="programlisting"><code class="computeroutput"><span class="keyword">template</span><span class="special"><</span></code><code class="computeroutput"><span class="keyword">typename</span> <span class="identifier">Value</span></code><code class="computeroutput"><span class="special">,</span></code>
<code class="computeroutput"><span class="keyword">typename</span> <span class="identifier">Parameters</span></code><code class="computeroutput"><span class="special">,</span></code>
- <code class="computeroutput"><span class="keyword">typename</span> <span class="identifier">Translator</span></code> = <code class="literal"><a class="link" href="reference.html#structboost_1_1geometry_1_1index_1_1translator_1_1def">translator::def</a></code><code class="computeroutput"><span class="special"><</span><span class="identifier">Value</span><span class="special">></span></code><code class="computeroutput"><span class="special">,</span></code>
+ <code class="computeroutput"><span class="keyword">typename</span> <span class="identifier">Translator</span></code> = <code class="literal"><a class="link" href="reference.html#structboost_1_1geometry_1_1index_1_1translator">index::translator</a></code><code class="computeroutput"><span class="special"><</span><span class="identifier">Value</span><span class="special">></span></code><code class="computeroutput"><span class="special">,</span></code>
<code class="computeroutput"><span class="keyword">typename</span> <span class="identifier">Allocator</span></code> = <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">allocator</span><span class="special"><</span><span class="identifier">Value</span><span class="special">></span></code><code class="computeroutput"><span class="special">></span></code>
<code class="computeroutput"><span class="keyword">class</span> <span class="identifier">rtree</span></code>
<code class="computeroutput"><span class="special">{</span></code>
@@ -291,7 +291,7 @@
<tr>
<td>
<p>
- <a name="classboost_1_1geometry_1_1index_1_1rtree_1ac011da09678f034a7fab487a9b973bfc"></a><code class="computeroutput"><span class="identifier">indexable_type</span></code>
+ <a name="classboost_1_1geometry_1_1index_1_1rtree_1a6533b05d4a2eea9d4a0033e192add466"></a><code class="computeroutput"><span class="identifier">indexable_type</span></code>
</p>
</td>
<td>
@@ -4616,7 +4616,7 @@
<a name="geometry_index.r_tree.reference.parameters.boost_geometry_index_linear"></a><a name="structboost_1_1geometry_1_1index_1_1linear"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.parameters.boost_geometry_index_linear" title="boost::geometry::index::linear">boost::geometry::index::linear</a>
</h5></div></div></div>
<p>
- <a class="indexterm" name="id919561"></a><a class="indexterm" name="id919566"></a><a class="indexterm" name="id919571"></a><a class="indexterm" name="id919576"></a>
+ <a class="indexterm" name="id947542"></a><a class="indexterm" name="id947547"></a><a class="indexterm" name="id947552"></a><a class="indexterm" name="id947557"></a>
Linear r-tree creation algorithm parameters.
</p>
<h6>
@@ -4691,7 +4691,7 @@
<a name="geometry_index.r_tree.reference.parameters.boost_geometry_index_quadratic"></a><a name="structboost_1_1geometry_1_1index_1_1quadratic"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.parameters.boost_geometry_index_quadratic" title="boost::geometry::index::quadratic">boost::geometry::index::quadratic</a>
</h5></div></div></div>
<p>
- <a class="indexterm" name="id919870"></a><a class="indexterm" name="id919874"></a><a class="indexterm" name="id919879"></a><a class="indexterm" name="id919884"></a>
+ <a class="indexterm" name="id947851"></a><a class="indexterm" name="id947856"></a><a class="indexterm" name="id947860"></a><a class="indexterm" name="id947865"></a>
Quadratic r-tree creation algorithm parameters.
</p>
<h6>
@@ -4766,7 +4766,7 @@
<a name="geometry_index.r_tree.reference.parameters.boost_geometry_index_rstar"></a><a name="structboost_1_1geometry_1_1index_1_1rstar"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.parameters.boost_geometry_index_rstar" title="boost::geometry::index::rstar">boost::geometry::index::rstar</a>
</h5></div></div></div>
<p>
- <a class="indexterm" name="id920178"></a><a class="indexterm" name="id920183"></a><a class="indexterm" name="id920188"></a><a class="indexterm" name="id920192"></a>
+ <a class="indexterm" name="id948159"></a><a class="indexterm" name="id948164"></a><a class="indexterm" name="id948169"></a><a class="indexterm" name="id948174"></a>
R*-tree creation algorithm parameters.
</p>
<h6>
@@ -4870,7 +4870,7 @@
<a name="geometry_index.r_tree.reference.parameters.boost_geometry_index_runtime_linear"></a><a name="classboost_1_1geometry_1_1index_1_1runtime_1_1linear"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.parameters.boost_geometry_index_runtime_linear" title="boost::geometry::index::runtime::linear">boost::geometry::index::runtime::linear</a>
</h5></div></div></div>
<p>
- <a class="indexterm" name="id920612"></a><a class="indexterm" name="id920617"></a><a class="indexterm" name="id920622"></a><a class="indexterm" name="id920627"></a><a class="indexterm" name="id920632"></a>
+ <a class="indexterm" name="id948594"></a><a class="indexterm" name="id948598"></a><a class="indexterm" name="id948603"></a><a class="indexterm" name="id948608"></a><a class="indexterm" name="id948613"></a>
Linear r-tree creation algorithm parameters.
</p>
<h6>
@@ -5006,7 +5006,7 @@
<a name="geometry_index.r_tree.reference.parameters.boost_geometry_index_runtime_quadratic"></a><a name="classboost_1_1geometry_1_1index_1_1runtime_1_1quadratic"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.parameters.boost_geometry_index_runtime_quadratic" title="boost::geometry::index::runtime::quadratic">boost::geometry::index::runtime::quadratic</a>
</h5></div></div></div>
<p>
- <a class="indexterm" name="id921090"></a><a class="indexterm" name="id921305"></a><a class="indexterm" name="id921310"></a><a class="indexterm" name="id921314"></a><a class="indexterm" name="id921319"></a>
+ <a class="indexterm" name="id949071"></a><a class="indexterm" name="id949076"></a><a class="indexterm" name="id949081"></a><a class="indexterm" name="id949296"></a><a class="indexterm" name="id949300"></a>
Quadratic r-tree creation algorithm parameters.
</p>
<h6>
@@ -5142,7 +5142,7 @@
<a name="geometry_index.r_tree.reference.parameters.boost_geometry_index_runtime_rstar"></a><a name="classboost_1_1geometry_1_1index_1_1runtime_1_1rstar"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.parameters.boost_geometry_index_runtime_rstar" title="boost::geometry::index::runtime::rstar">boost::geometry::index::runtime::rstar</a>
</h5></div></div></div>
<p>
- <a class="indexterm" name="id921778"></a><a class="indexterm" name="id921782"></a><a class="indexterm" name="id921787"></a><a class="indexterm" name="id921792"></a><a class="indexterm" name="id921797"></a>
+ <a class="indexterm" name="id949759"></a><a class="indexterm" name="id949764"></a><a class="indexterm" name="id949768"></a><a class="indexterm" name="id949773"></a><a class="indexterm" name="id949778"></a>
R*-tree creation algorithm parameters.
</p>
<h6>
@@ -5315,6 +5315,82 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h4 class="title">
+<a name="geometry_index.r_tree.reference.translator"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.translator" title="Translator (boost::geometry::index::translator)">Translator
+ (boost::geometry::index::translator)</a>
+</h4></div></div></div>
+<div class="section">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="geometry_index.r_tree.reference.translator.boost_geometry_index_translator"></a><a name="structboost_1_1geometry_1_1index_1_1translator"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.translator.boost_geometry_index_translator" title="boost::geometry::index::translator">boost::geometry::index::translator</a>
+</h5></div></div></div>
+<p>
+ <a class="indexterm" name="id950391"></a><a class="indexterm" name="id950396"></a><a class="indexterm" name="id950401"></a><a class="indexterm" name="id950406"></a>
+The default translator.
+ </p>
+<h6>
+<a name="geometry_index.r_tree.reference.translator.boost_geometry_index_translator.h0"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.translator.boost_geometry_index_translator.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translator.boost_geometry_index_translator.description">Description</a>
+ </h6>
+<p>
+ It translates Value object to Indexable object. The default version handles
+ Values which are Indexables. This translator is also specialized for
+ std::pair<Indexable, Second> and boost::tuple<Indexable, ...>.
+ </p>
+<h6>
+<a name="geometry_index.r_tree.reference.translator.boost_geometry_index_translator.h1"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.translator.boost_geometry_index_translator.header"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translator.boost_geometry_index_translator.header">Header</a>
+ </h6>
+<p>
+ <code class="computeroutput"><span class="preprocessor">#include</span> <span class="special"><</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">geometry</span><span class="special">/</span><span class="identifier">index</span><span class="special">/</span><span class="identifier">translator</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span></code>
+ </p>
+<h6>
+<a name="geometry_index.r_tree.reference.translator.boost_geometry_index_translator.h2"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.translator.boost_geometry_index_translator.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translator.boost_geometry_index_translator.synopsis">Synopsis</a>
+ </h6>
+<pre class="programlisting"><code class="computeroutput"><span class="keyword">template</span><span class="special"><</span></code><code class="computeroutput"><span class="keyword">typename</span> <span class="identifier">Value</span></code><code class="computeroutput"><span class="special">></span></code>
+<code class="computeroutput"><span class="keyword">struct</span> <span class="identifier">translator</span></code>
+<code class="computeroutput"><span class="special">{</span></code>
+<code class="computeroutput"> <span class="comment">// ...</span></code>
+<code class="computeroutput"><span class="special">};</span></code>
+</pre>
+<h6>
+<a name="geometry_index.r_tree.reference.translator.boost_geometry_index_translator.h3"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.translator.boost_geometry_index_translator.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translator.boost_geometry_index_translator.template_parameter_s_">Template
+ parameter(s)</a>
+ </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+ <p>
+ Parameter
+ </p>
+ </th>
+<th>
+ <p>
+ Description
+ </p>
+ </th>
+</tr></thead>
+<tbody><tr>
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">Value</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ The Value type which may be translated directly to the Indexable.
+ </p>
+ </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
<a name="geometry_index.r_tree.reference.group__predicates"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates" title="Predicates (boost::geometry::index::)">Predicates
(boost::geometry::index::)</a>
</h4></div></div></div>
@@ -6714,254 +6790,6 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h4 class="title">
-<a name="geometry_index.r_tree.reference.translators"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.translators" title="Translators (boost::geometry::index::translators::)">Translators
- (boost::geometry::index::translators::)</a>
-</h4></div></div></div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def"></a><a name="structboost_1_1geometry_1_1index_1_1translator_1_1def"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def" title="boost::geometry::index::translator::def">boost::geometry::index::translator::def</a>
-</h5></div></div></div>
-<p>
- <a class="indexterm" name="id930098"></a><a class="indexterm" name="id930103"></a><a class="indexterm" name="id930108"></a><a class="indexterm" name="id930113"></a><a class="indexterm" name="id930118"></a>
-The default translator.
- </p>
-<h6>
-<a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def.description">Description</a>
- </h6>
-<p>
- It translates Value object to Indexable object. The default version handles
- Values which are Indexables. This translator is also specialized for
- std::pair<Indexable, Second> and boost::tuple<Indexable, ...>.
- </p>
-<h6>
-<a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def.h1"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def.header"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def.header">Header</a>
- </h6>
-<p>
- <code class="computeroutput"><span class="preprocessor">#include</span> <span class="special"><</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">geometry</span><span class="special">/</span><span class="identifier">index</span><span class="special">/</span><span class="identifier">translator</span><span class="special">/</span><span class="identifier">def</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span></code>
- </p>
-<h6>
-<a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def.h2"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def.synopsis">Synopsis</a>
- </h6>
-<pre class="programlisting"><code class="computeroutput"><span class="keyword">template</span><span class="special"><</span></code><code class="computeroutput"><span class="keyword">typename</span> <span class="identifier">Value</span></code><code class="computeroutput"><span class="special">></span></code>
-<code class="computeroutput"><span class="keyword">struct</span> <span class="identifier">def</span></code>
-<code class="computeroutput"><span class="special">{</span></code>
-<code class="computeroutput"> <span class="comment">// ...</span></code>
-<code class="computeroutput"><span class="special">};</span></code>
-</pre>
-<h6>
-<a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def.h3"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_def.template_parameter_s_">Template
- parameter(s)</a>
- </h6>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
- <p>
- Parameter
- </p>
- </th>
-<th>
- <p>
- Description
- </p>
- </th>
-</tr></thead>
-<tbody><tr>
-<td>
- <p>
- <code class="computeroutput"><span class="identifier">Value</span></code>
- </p>
- </td>
-<td>
- <p>
- The Value type which may be translated directly to the Indexable.
- </p>
- </td>
-</tr></tbody>
-</table></div>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index"></a><a name="classboost_1_1geometry_1_1index_1_1translator_1_1index"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index" title="boost::geometry::index::translator::index">boost::geometry::index::translator::index</a>
-</h5></div></div></div>
-<p>
- <a class="indexterm" name="id930382"></a><a class="indexterm" name="id930386"></a><a class="indexterm" name="id930391"></a><a class="indexterm" name="id930396"></a><a class="indexterm" name="id930401"></a>
-The index translator.
- </p>
-<h6>
-<a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.description">Description</a>
- </h6>
-<p>
- This translator translates from index of an element in an external Container
- to the Indexable. The container should have operator[](size_type) defined.
- Index translator uses <a class="link" href="reference.html#structboost_1_1geometry_1_1index_1_1translator_1_1def">translator::def</a><...>
- to translate from Container::value_type to the Indexable which means
- that it can handle Indexables, std::pairs and boost::tuples stored in
- an external Container.
- </p>
-<h6>
-<a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.h1"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.header"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.header">Header</a>
- </h6>
-<p>
- <code class="computeroutput"><span class="preprocessor">#include</span> <span class="special"><</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">geometry</span><span class="special">/</span><span class="identifier">index</span><span class="special">/</span><span class="identifier">translator</span><span class="special">/</span><span class="identifier">index</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span></code>
- </p>
-<h6>
-<a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.h2"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.synopsis">Synopsis</a>
- </h6>
-<pre class="programlisting"><code class="computeroutput"><span class="keyword">template</span><span class="special"><</span></code><code class="computeroutput"><span class="keyword">typename</span> <span class="identifier">Container</span></code><code class="computeroutput"><span class="special">></span></code>
-<code class="computeroutput"><span class="keyword">class</span> <span class="identifier">index</span></code>
-<code class="computeroutput"><span class="special">{</span></code>
-<code class="computeroutput"> <span class="comment">// ...</span></code>
-<code class="computeroutput"><span class="special">};</span></code>
-</pre>
-<h6>
-<a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.h3"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.template_parameter_s_">Template
- parameter(s)</a>
- </h6>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
- <p>
- Parameter
- </p>
- </th>
-<th>
- <p>
- Description
- </p>
- </th>
-</tr></thead>
-<tbody><tr>
-<td>
- <p>
- <code class="computeroutput"><span class="identifier">Container</span></code>
- </p>
- </td>
-<td>
- <p>
- The Container type.
- </p>
- </td>
-</tr></tbody>
-</table></div>
-<h6>
-<a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.h4"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.constructor_s__and_destructor"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.constructor_s__and_destructor">Constructor(s)
- and destructor</a>
- </h6>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
- <p>
- Function
- </p>
- </th>
-<th>
- <p>
- Description
- </p>
- </th>
-</tr></thead>
-<tbody><tr>
-<td>
- <p>
- <a class="link" href="reference.html#classboost_1_1geometry_1_1index_1_1translator_1_1index_1a87e7e498c20aa3bf38e350a6ab19e736"><code class="computeroutput"><span class="identifier">index</span><span class="special">(</span><span class="identifier">Container</span> <span class="keyword">const</span>
- <span class="special">&)</span></code></a>
- </p>
- </td>
-<td>
- <p>
- The constructor.
- </p>
- </td>
-</tr></tbody>
-</table></div>
-<div class="section">
-<div class="titlepage"><div><div><h6 class="title">
-<a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.index_container_const___"></a><a name="classboost_1_1geometry_1_1index_1_1translator_1_1index_1a87e7e498c20aa3bf38e350a6ab19e736"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.index_container_const___" title="index(Container const &)">index(Container
- const &)</a>
-</h6></div></div></div>
-<p>
- The constructor.
- </p>
-<h7><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.index_container_const___.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.index_container_const___.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.index_container_const___.synopsis">Synopsis</a>
- </h7><pre class="programlisting"><code class="computeroutput"><span class="identifier">index</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">Container</span> <span class="keyword">const</span> <span class="special">&</span></code> <code class="computeroutput"><span class="identifier">c</span></code><code class="computeroutput"><span class="special">)</span></code>
-</pre>
-<h7><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.index_container_const___.h1"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.index_container_const___.modifier_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.index_container_const___.modifier_s_">Modifier(s)</a>
- </h7><p>
-</p>
-<pre class="programlisting"><span class="keyword">explicit</span></pre>
-<p>
- </p>
-<h7><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.index_container_const___.h2"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.index_container_const___.parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.translators.boost_geometry_index_translator_index.index_container_const___.parameter_s_">Parameter(s)</a>
- </h7><div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
- <p>
- Type
- </p>
- </th>
-<th>
- <p>
- Name
- </p>
- </th>
-<th>
- <p>
- Description
- </p>
- </th>
-</tr></thead>
-<tbody><tr>
-<td>
- <p>
- <code class="computeroutput"><span class="identifier">Container</span> <span class="keyword">const</span> <span class="special">&</span></code>
- </p>
- </td>
-<td>
- <p>
- <code class="computeroutput"><span class="identifier">c</span></code>
- </p>
- </td>
-<td>
- <p>
- The container which stores indexed values.
- </p>
- </td>
-</tr></tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
<a name="geometry_index.r_tree.reference.group__inserters"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__inserters" title="Inserters (boost::geometry::index::)">Inserters
(boost::geometry::index::)</a>
</h4></div></div></div>
Modified: sandbox-branches/geometry/index/doc/html/geometry_index/r_tree/rtree_examples.html
==============================================================================
--- sandbox-branches/geometry/index/doc/html/geometry_index/r_tree/rtree_examples.html (original)
+++ sandbox-branches/geometry/index/doc/html/geometry_index/r_tree/rtree_examples.html 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -127,7 +127,7 @@
<span class="keyword">typedef</span> <span class="identifier">bgm</span><span class="special">::</span><span class="identifier">box</span><span class="special"><</span><span class="identifier">P</span><span class="special">></span> <span class="identifier">B</span><span class="special">;</span>
<span class="keyword">typedef</span> <span class="identifier">bgi</span><span class="special">::</span><span class="identifier">linear</span><span class="special"><</span><span class="number">32</span><span class="special">,</span> <span class="number">8</span><span class="special">></span> <span class="identifier">Par</span><span class="special">;</span>
- <span class="keyword">typedef</span> <span class="identifier">bgi</span><span class="special">::</span><span class="identifier">translator</span><span class="special">::</span><span class="identifier">def</span><span class="special"><</span><span class="identifier">B</span><span class="special">></span> <span class="identifier">Tr</span><span class="special">;</span>
+ <span class="keyword">typedef</span> <span class="identifier">bgi</span><span class="special">::</span><span class="identifier">translator</span><span class="special"><</span><span class="identifier">B</span><span class="special">></span> <span class="identifier">Tr</span><span class="special">;</span>
<span class="keyword">typedef</span> <span class="identifier">allocator</span><span class="special"><</span><span class="identifier">B</span><span class="special">,</span> <span class="identifier">managed_shared_memory</span><span class="special">::</span><span class="identifier">segment_manager</span><span class="special">></span> <span class="identifier">Alloc</span><span class="special">;</span>
<span class="keyword">typedef</span> <span class="identifier">bgi</span><span class="special">::</span><span class="identifier">rtree</span><span class="special"><</span><span class="identifier">B</span><span class="special">,</span> <span class="identifier">Par</span><span class="special">,</span> <span class="identifier">Tr</span><span class="special">,</span> <span class="identifier">Alloc</span><span class="special">></span> <span class="identifier">Rtree</span><span class="special">;</span>
Modified: sandbox-branches/geometry/index/doc/html/index.html
==============================================================================
--- sandbox-branches/geometry/index/doc/html/index.html (original)
+++ sandbox-branches/geometry/index/doc/html/index.html 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -51,7 +51,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: February 19, 2013 at 19:29:30 GMT</small></p></td>
+<td align="left"><p><small>Last revised: February 22, 2013 at 03:18:40 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>
Modified: sandbox-branches/geometry/index/doc/make_qbk.py
==============================================================================
--- sandbox-branches/geometry/index/doc/make_qbk.py (original)
+++ sandbox-branches/geometry/index/doc/make_qbk.py 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -27,11 +27,13 @@
os.system(cmd % ("classboost_1_1geometry_1_1index_1_1runtime_1_1quadratic", "rtree_runtime_quadratic"))
os.system(cmd % ("classboost_1_1geometry_1_1index_1_1runtime_1_1rstar", "rtree_runtime_rstar"))
+os.system(cmd % ("structboost_1_1geometry_1_1index_1_1translator", "translator"))
+#os.system(cmd % ("structboost_1_1geometry_1_1index_1_1translator_3_01std_1_1pair_3_01_indexable_00_01_second_01_4_01_4", "translator_pair"))
+#os.system(cmd % ("structboost_1_1geometry_1_1index_1_1translator_3_01boost_1_1tuple_3_01_indexable_00_01_t1_00_01_1c55aa63046ee2c1171cfc2033fb0edd", "translator_tuple"))
+
os.system(cmd % ("group__predicates", "predicates"))
os.system(cmd % ("group__nearest__relations", "nearest_relations"))
os.system(cmd % ("group__adaptors", "adaptors"))
-os.system(cmd % ("structboost_1_1geometry_1_1index_1_1translator_1_1def", "translator_def"))
-os.system(cmd % ("classboost_1_1geometry_1_1index_1_1translator_1_1index", "translator_index"))
os.system(cmd % ("group__inserters", "inserters"))
os.system("b2")
Modified: sandbox-branches/geometry/index/doc/rtree/reference.qbk
==============================================================================
--- sandbox-branches/geometry/index/doc/rtree/reference.qbk (original)
+++ sandbox-branches/geometry/index/doc/rtree/reference.qbk 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -24,17 +24,18 @@
[endsect]
-[include ../generated/predicates.qbk]
-[include ../generated/nearest_relations.qbk]
-[include ../generated/adaptors.qbk]
-
-[section:translators Translators (boost::geometry::index::translators::)]
+[section:translator Translator (boost::geometry::index::translator)]
-[include ../generated/translator_def.qbk]
-[include ../generated/translator_index.qbk]
+[include ../generated/translator.qbk]
+[/include ../generated/translator_pair.qbk/]
+[/include ../generated/translator_tuple.qbk/]
[endsect]
+[include ../generated/predicates.qbk]
+[include ../generated/nearest_relations.qbk]
+[include ../generated/adaptors.qbk]
+
[include ../generated/inserters.qbk]
[endsect]
\ No newline at end of file
Modified: sandbox-branches/geometry/index/doc/src/examples/rtree/interprocess.cpp
==============================================================================
--- sandbox-branches/geometry/index/doc/src/examples/rtree/interprocess.cpp (original)
+++ sandbox-branches/geometry/index/doc/src/examples/rtree/interprocess.cpp 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -35,7 +35,7 @@
typedef bgm::box<P> B;
typedef bgi::linear<32, 8> Par;
- typedef bgi::translator::def<B> Tr;
+ typedef bgi::translator<B> Tr;
typedef allocator<B, managed_shared_memory::segment_manager> Alloc;
typedef bgi::rtree<B, Par, Tr, Alloc> Rtree;
Modified: sandbox-branches/geometry/index/test/rtree/test_rtree.hpp
==============================================================================
--- sandbox-branches/geometry/index/test/rtree/test_rtree.hpp (original)
+++ sandbox-branches/geometry/index/test/rtree/test_rtree.hpp 2013-02-21 22:23:41 EST (Thu, 21 Feb 2013)
@@ -205,10 +205,10 @@
Indexable indexable;
};
-namespace boost { namespace geometry { namespace index { namespace translator {
+namespace boost { namespace geometry { namespace index {
template <typename Indexable>
-struct def< boost::shared_ptr< test_object<Indexable> > >
+struct translator< boost::shared_ptr< test_object<Indexable> > >
{
typedef boost::shared_ptr< test_object<Indexable> > value_type;
typedef Indexable const& result_type;
@@ -224,7 +224,7 @@
}
};
-}}}}
+}}}
template <typename T, typename C>
struct generate_value< boost::shared_ptr<test_object<bg::model::point<T, 2, C> > > >
@@ -266,10 +266,10 @@
Indexable indexable;
};
-namespace boost { namespace geometry { namespace index { namespace translator {
+namespace boost { namespace geometry { namespace index {
template <typename Indexable>
-struct def< counting_value<Indexable> >
+struct translator< counting_value<Indexable> >
{
typedef counting_value<Indexable> value_type;
typedef Indexable const& result_type;
@@ -285,7 +285,7 @@
}
};
-}}}}
+}}}
template <typename T, typename C>
struct generate_value< counting_value<bg::model::point<T, 2, C> > >
@@ -330,26 +330,26 @@
Indexable indexable;
};
-namespace boost { namespace geometry { namespace index { namespace translator {
+namespace boost { namespace geometry { namespace index {
- template <typename Indexable>
- struct def< value_no_dctor<Indexable> >
- {
- typedef value_no_dctor<Indexable> value_type;
- typedef Indexable const& result_type;
+template <typename Indexable>
+struct translator< value_no_dctor<Indexable> >
+{
+ typedef value_no_dctor<Indexable> value_type;
+ typedef Indexable const& result_type;
- result_type operator()(value_type const& value) const
- {
- return value.indexable;
- }
+ result_type operator()(value_type const& value) const
+ {
+ return value.indexable;
+ }
- bool equals(value_type const& v1, value_type const& v2) const
- {
- return boost::geometry::equals(v1.indexable, v2.indexable);
- }
- };
+ bool equals(value_type const& v1, value_type const& v2) const
+ {
+ return boost::geometry::equals(v1.indexable, v2.indexable);
+ }
+};
-}}}}
+}}}
template <typename Indexable>
struct generate_value_default< value_no_dctor<Indexable> >
@@ -1109,7 +1109,7 @@
template <typename Value, typename Parameters, typename Allocator>
void test_rtree_by_value(Parameters const& parameters, Allocator const& allocator)
{
- typedef bgi::translator::def<Value> T;
+ typedef bgi::translator<Value> T;
typedef typename Allocator::template rebind<Value>::other A;
typedef bgi::rtree<Value, Parameters, T, A> Tree;
typedef typename Tree::box_type B;
@@ -1165,7 +1165,7 @@
{
typedef counting_value<Indexable> Value;
- typedef bgi::translator::def<Value> T;
+ typedef bgi::translator<Value> T;
typedef typename Allocator::template rebind<Value>::other A;
typedef bgi::rtree<Value, Parameters, T, A> Tree;
typedef typename Tree::box_type B;
@@ -1207,7 +1207,7 @@
{
typedef std::pair<Indexable, int> Value;
- typedef bgi::translator::def<Value> T;
+ typedef bgi::translator<Value> T;
typedef typename Allocator::template rebind<Value>::other A;
typedef bgi::rtree<Value, Parameters, T, A> Tree;
typedef typename Tree::box_type B;
@@ -1237,7 +1237,7 @@
template <typename Value, typename Parameters, typename Allocator>
void test_rtree_bounds(Parameters const& parameters, Allocator const& allocator)
{
- typedef bgi::translator::def<Value> T;
+ typedef bgi::translator<Value> T;
typedef typename Allocator::template rebind<Value>::other A;
typedef bgi::rtree<Value, Parameters, T, A> Tree;
typedef typename Tree::box_type B;
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