|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r82595 - in sandbox-branches/geometry/index: boost/geometry/index boost/geometry/index/detail doc doc/generated doc/html doc/html/geometry_index/r_tree tests
From: adam.wulkiewicz_at_[hidden]
Date: 2013-01-24 08:51:03
Author: awulkiew
Date: 2013-01-24 08:51:01 EST (Thu, 24 Jan 2013)
New Revision: 82595
URL: http://svn.boost.org/trac/boost/changeset/82595
Log:
Change in predicates.
empty() removed.
value() parameter renamed to Fun const& fun.
operator! moved to index::detail namespace.
Reference updated.
Properties modified:
sandbox-branches/geometry/index/doc/ (props changed)
Text files modified:
sandbox-branches/geometry/index/boost/geometry/index/detail/predicates.hpp | 20 +-
sandbox-branches/geometry/index/boost/geometry/index/predicates.hpp | 124 +++++++++----------
sandbox-branches/geometry/index/doc/generated/predicates.qbk | 63 +++------
sandbox-branches/geometry/index/doc/generated/rtree.qbk | 6
sandbox-branches/geometry/index/doc/html/geometry_index/r_tree/reference.html | 251 ++++++++++++++++++---------------------
sandbox-branches/geometry/index/doc/html/index.html | 2
sandbox-branches/geometry/index/tests/additional_speed.cpp | 57 ++++++++
7 files changed, 263 insertions(+), 260 deletions(-)
Modified: sandbox-branches/geometry/index/boost/geometry/index/detail/predicates.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/detail/predicates.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/detail/predicates.hpp 2013-01-24 08:51:01 EST (Thu, 24 Jan 2013)
@@ -22,11 +22,11 @@
struct empty {};
-template <typename ValuePredicate>
+template <typename Fun>
struct value
{
- value(ValuePredicate const& vpred) : value_predicate(vpred) {}
- ValuePredicate value_predicate;
+ value(Fun const& f) : fun(f) {}
+ Fun fun;
};
template <typename Geometry>
@@ -150,13 +150,13 @@
}
};
-template <typename ValuePredicate>
-struct predicate_check<value<ValuePredicate>, value_tag>
+template <typename Fun>
+struct predicate_check<value<Fun>, value_tag>
{
template <typename Value, typename Indexable>
- static inline bool apply(value<ValuePredicate> const& p, Value const& v, Indexable const&)
+ static inline bool apply(value<Fun> const& p, Value const& v, Indexable const&)
{
- return p.value_predicate(v);
+ return p.fun(v);
}
};
@@ -304,11 +304,11 @@
}
};
-template <typename ValuePredicate>
-struct predicate_check<value<ValuePredicate>, envelope_tag>
+template <typename Fun>
+struct predicate_check<value<Fun>, envelope_tag>
{
template <typename Value, typename Box>
- static bool apply(value<ValuePredicate> const&, Value const&, Box const&)
+ static bool apply(value<Fun> const&, Value const&, Box const&)
{
return true;
}
Modified: sandbox-branches/geometry/index/boost/geometry/index/predicates.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/predicates.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/predicates.hpp 2013-01-24 08:51:01 EST (Thu, 24 Jan 2013)
@@ -27,34 +27,6 @@
namespace boost { namespace geometry { namespace index {
/*!
-\brief Generate empty predicate.
-
-\ingroup predicates
-*/
-inline detail::empty empty()
-{
- return detail::empty();
-}
-
-/*!
-\brief Generate value predicate.
-
-A wrapper around user-defined functor
-describing if Value should be returned by spatial query.
-
-\ingroup predicates
-
-\tparam ValuePredicate Functor type.
-
-\param vpred The functor.
-*/
-template <typename ValuePredicate>
-inline detail::value<ValuePredicate> value(ValuePredicate const& vpred)
-{
- return detail::value<ValuePredicate>(vpred);
-}
-
-/*!
\brief Generate \c covered_by() predicate.
Generate a predicate defining Value and Geometry relationship.
@@ -168,92 +140,114 @@
return detail::within<Geometry>(g);
}
-}}} // namespace boost::geometry::index
+/*!
+\brief Generate value predicate.
+
+A wrapper around user-defined functor
+describing if Value should be returned by spatial query.
+
+\ingroup predicates
+
+\tparam Fun Functor type.
+
+\param fun The functor.
+*/
+template <typename Fun>
+inline detail::value<Fun> value(Fun const& fun)
+{
+ return detail::value<Fun>(fun);
+}
+
+namespace detail {
// operator! generators
template <typename Geometry>
-boost::geometry::index::detail::not_covered_by<Geometry>
-operator!(boost::geometry::index::detail::covered_by<Geometry> const& p)
+not_covered_by<Geometry>
+operator!(covered_by<Geometry> const& p)
{
- return boost::geometry::index::detail::not_covered_by<Geometry>(p.geometry);
+ return not_covered_by<Geometry>(p.geometry);
}
template <typename Geometry>
-boost::geometry::index::detail::covered_by<Geometry>
-operator!(boost::geometry::index::detail::not_covered_by<Geometry> const& p)
+covered_by<Geometry>
+operator!(not_covered_by<Geometry> const& p)
{
- return boost::geometry::index::detail::covered_by<Geometry>(p.geometry);
+ return covered_by<Geometry>(p.geometry);
}
template <typename Geometry>
-boost::geometry::index::detail::not_disjoint<Geometry>
-operator!(boost::geometry::index::detail::disjoint<Geometry> const& p)
+not_disjoint<Geometry>
+operator!(disjoint<Geometry> const& p)
{
- return boost::geometry::index::detail::not_disjoint<Geometry>(p.geometry);
+ return not_disjoint<Geometry>(p.geometry);
}
template <typename Geometry>
-boost::geometry::index::detail::disjoint<Geometry>
-operator!(boost::geometry::index::detail::not_disjoint<Geometry> const& p)
+disjoint<Geometry>
+operator!(not_disjoint<Geometry> const& p)
{
- return boost::geometry::index::detail::disjoint<Geometry>(p.geometry);
+ return disjoint<Geometry>(p.geometry);
}
template <typename Geometry>
-boost::geometry::index::detail::not_intersects<Geometry>
-operator!(boost::geometry::index::detail::intersects<Geometry> const& p)
+not_intersects<Geometry>
+operator!(intersects<Geometry> const& p)
{
- return boost::geometry::index::detail::not_intersects<Geometry>(p.geometry);
+ return not_intersects<Geometry>(p.geometry);
}
template <typename Geometry>
-boost::geometry::index::detail::intersects<Geometry>
-operator!(boost::geometry::index::detail::not_intersects<Geometry> const& p)
+intersects<Geometry>
+operator!(not_intersects<Geometry> const& p)
{
- return boost::geometry::index::detail::intersects<Geometry>(p.geometry);
+ return intersects<Geometry>(p.geometry);
}
template <typename Geometry>
-boost::geometry::index::detail::not_overlaps<Geometry>
-operator!(boost::geometry::index::detail::overlaps<Geometry> const& p)
+not_overlaps<Geometry>
+operator!(overlaps<Geometry> const& p)
{
- return boost::geometry::index::detail::not_overlaps<Geometry>(p.geometry);
+ return not_overlaps<Geometry>(p.geometry);
}
template <typename Geometry>
-boost::geometry::index::detail::overlaps<Geometry>
-operator!(boost::geometry::index::detail::not_overlaps<Geometry> const& p)
+overlaps<Geometry>
+operator!(not_overlaps<Geometry> const& p)
{
- return boost::geometry::index::detail::overlaps<Geometry>(p.geometry);
+ return overlaps<Geometry>(p.geometry);
}
//template <typename Geometry>
-//boost::geometry::index::detail::not_touches<Geometry>
-//operator!(boost::geometry::index::detail::touches<Geometry> const& p)
+//not_touches<Geometry>
+//operator!(touches<Geometry> const& p)
//{
-// return boost::geometry::index::detail::not_touches<Geometry>(p.geometry);
+// return not_touches<Geometry>(p.geometry);
//}
//
//template <typename Geometry>
-//boost::geometry::index::detail::touches<Geometry>
-//operator!(boost::geometry::index::detail::not_touches<Geometry> const& p)
+//touches<Geometry>
+//operator!(not_touches<Geometry> const& p)
//{
-// return boost::geometry::index::detail::touches<Geometry>(p.geometry);
+// return touches<Geometry>(p.geometry);
//}
template <typename Geometry>
-boost::geometry::index::detail::not_within<Geometry>
-operator!(boost::geometry::index::detail::within<Geometry> const& p)
+not_within<Geometry>
+operator!(within<Geometry> const& p)
{
- return boost::geometry::index::detail::not_within<Geometry>(p.geometry);
+ return not_within<Geometry>(p.geometry);
}
template <typename Geometry>
-boost::geometry::index::detail::within<Geometry>
-operator!(boost::geometry::index::detail::not_within<Geometry> const& p)
+within<Geometry>
+operator!(not_within<Geometry> const& p)
{
- return boost::geometry::index::detail::within<Geometry>(p.geometry);
+ return within<Geometry>(p.geometry);
}
+
+} // namespace detail
+
+}}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_INDEX_PREDICATES_HPP
Modified: sandbox-branches/geometry/index/doc/generated/predicates.qbk
==============================================================================
--- sandbox-branches/geometry/index/doc/generated/predicates.qbk (original)
+++ sandbox-branches/geometry/index/doc/generated/predicates.qbk 2013-01-24 08:51:01 EST (Thu, 24 Jan 2013)
@@ -4,51 +4,14 @@
[heading Functions]
[table
[[Function][Description]]
-[[[link group__predicates_1ga150fd87dc53e5472f8905bb5827428e2 `empty()`]][Generate empty predicate. ]]
-[[[link group__predicates_1ga5c93efac97377136564623cbaf35d880 `value(ValuePredicate const &)`]][Generate value predicate. ]]
[[[link group__predicates_1ga0a613a7f1d18ac33955bfdc2c5777c61 `covered_by(Geometry const &)`]][Generate [^[link group__predicates_1ga0a613a7f1d18ac33955bfdc2c5777c61 covered_by()]] predicate. ]]
[[[link group__predicates_1ga351bb3b82e019ff45adf789385b8007d `disjoint(Geometry const &)`]][Generate [^[link group__predicates_1ga351bb3b82e019ff45adf789385b8007d disjoint()]] predicate. ]]
[[[link group__predicates_1ga7301c50e0272976b9f1434536383e6d0 `intersects(Geometry const &)`]][Generate [^[link group__predicates_1ga7301c50e0272976b9f1434536383e6d0 intersects()]] predicate. ]]
[[[link group__predicates_1ga5511236f56be1defcccbf11e742ccd88 `overlaps(Geometry const &)`]][Generate [^[link group__predicates_1ga5511236f56be1defcccbf11e742ccd88 overlaps()]] predicate. ]]
[[[link group__predicates_1gabf9c4e76dd8a09a4c476f2f8fa8a0e4d `within(Geometry const &)`]][Generate [^[link group__predicates_1gabf9c4e76dd8a09a4c476f2f8fa8a0e4d within()]] predicate. ]]
+[[[link group__predicates_1ga8acb81106fce01da72f310184ab4d9ce `value(Fun const &)`]][Generate value predicate. ]]
]
-[#group__predicates_1ga150fd87dc53e5472f8905bb5827428e2]
-[section empty()]
-Generate empty predicate.
-
-[heading Synopsis]
-[pre
-
-`detail::empty boost::geometry::index::empty``()`
-]
-
-[endsect]
-
-[#group__predicates_1ga5c93efac97377136564623cbaf35d880]
-[section value(ValuePredicate const &)]
-Generate value predicate.
-
-[heading Description]
-A wrapper around user-defined functor describing if Value should be returned by spatial query.[heading Synopsis]
-[pre
-`template<``typename ValuePredicate``>`
-`detail::value<ValuePredicate> boost::geometry::index::value``(``ValuePredicate const &` `vpred``)`
-]
-
-[heading Template parameter(s)]
-[table
-[[Parameter] [Description]]
-[[`ValuePredicate`][Functor type.]]
-]
-
-[heading Parameter(s)]
-[table
-[[Type][Name][Description]]
-[[`ValuePredicate const &`][ `vpred` ][The functor. ]]
-]
-[endsect]
-
[#group__predicates_1ga0a613a7f1d18ac33955bfdc2c5777c61]
[section covered_by(Geometry const &)]
Generate [^[link group__predicates_1ga0a613a7f1d18ac33955bfdc2c5777c61 covered_by()]] predicate.
@@ -169,5 +132,29 @@
]
[endsect]
+[#group__predicates_1ga8acb81106fce01da72f310184ab4d9ce]
+[section value(Fun const &)]
+Generate value predicate.
+
+[heading Description]
+A wrapper around user-defined functor describing if Value should be returned by spatial query.[heading Synopsis]
+[pre
+`template<``typename Fun``>`
+`detail::value<Fun> boost::geometry::index::value``(``Fun const &` `fun``)`
+]
+
+[heading Template parameter(s)]
+[table
+[[Parameter] [Description]]
+[[`Fun`][Functor type.]]
+]
+
+[heading Parameter(s)]
+[table
+[[Type][Name][Description]]
+[[`Fun const &`][ `fun` ][The functor. ]]
+]
+[endsect]
+
[endsect]
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-01-24 08:51:01 EST (Thu, 24 Jan 2013)
@@ -624,7 +624,7 @@
* [^`! `[link group__predicates_1ga7301c50e0272976b9f1434536383e6d0 boost::geometry::index::intersects()]],
* [^`! `[link group__predicates_1ga5511236f56be1defcccbf11e742ccd88 boost::geometry::index::overlaps()]],
* [^`! `[link group__predicates_1gabf9c4e76dd8a09a4c476f2f8fa8a0e4d boost::geometry::index::within()]]
-* [^[link group__predicates_1ga5c93efac97377136564623cbaf35d880 boost::geometry::index::value()]].
+* [^[link group__predicates_1ga8acb81106fce01da72f310184ab4d9ce boost::geometry::index::value()]].
Those predicates may be passed together in [^`std::pair`] or [^`boost::tuple`].[heading Synopsis]
@@ -742,7 +742,7 @@
* [^`! `[link group__predicates_1ga7301c50e0272976b9f1434536383e6d0 boost::geometry::index::intersects()]],
* [^`! `[link group__predicates_1ga5511236f56be1defcccbf11e742ccd88 boost::geometry::index::overlaps()]],
* [^`! `[link group__predicates_1gabf9c4e76dd8a09a4c476f2f8fa8a0e4d boost::geometry::index::within()]]
-* [^[link group__predicates_1ga5c93efac97377136564623cbaf35d880 boost::geometry::index::value()]].
+* [^[link group__predicates_1ga8acb81106fce01da72f310184ab4d9ce boost::geometry::index::value()]].
Those predicates may be passed together in [^`std::pair`] or [^`boost::tuple`].[heading Synopsis]
@@ -861,7 +861,7 @@
* [^`! `[link group__predicates_1ga7301c50e0272976b9f1434536383e6d0 boost::geometry::index::intersects()]],
* [^`! `[link group__predicates_1ga5511236f56be1defcccbf11e742ccd88 boost::geometry::index::overlaps()]],
* [^`! `[link group__predicates_1gabf9c4e76dd8a09a4c476f2f8fa8a0e4d boost::geometry::index::within()]]
-* [^[link group__predicates_1ga5c93efac97377136564623cbaf35d880 boost::geometry::index::value()]].
+* [^[link group__predicates_1ga8acb81106fce01da72f310184ab4d9ce boost::geometry::index::value()]].
Those predicates may be passed together in [^`std::pair`] or [^`boost::tuple`].[heading Synopsis]
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-01-24 08:51:01 EST (Thu, 24 Jan 2013)
@@ -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="id910442"></a><a class="indexterm" name="id910446"></a><a class="indexterm" name="id910451"></a><a class="indexterm" name="id910456"></a>
+ <a class="indexterm" name="id887504"></a><a class="indexterm" name="id887509"></a><a class="indexterm" name="id887514"></a><a class="indexterm" name="id887518"></a>
The R-tree spatial index.
</p>
<h6>
@@ -2659,7 +2659,7 @@
<code class="literal"><code class="computeroutput"><span class="special">!</span> </code><a class="link" href="reference.html#group__predicates_1gabf9c4e76dd8a09a4c476f2f8fa8a0e4d">boost::geometry::index::within()</a></code>
</li>
<li class="listitem">
- <code class="literal"><a class="link" href="reference.html#group__predicates_1ga5c93efac97377136564623cbaf35d880">boost::geometry::index::value()</a></code>.
+ <code class="literal"><a class="link" href="reference.html#group__predicates_1ga8acb81106fce01da72f310184ab4d9ce">boost::geometry::index::value()</a></code>.
</li>
</ul></div>
<p>
@@ -3042,7 +3042,7 @@
<code class="literal"><code class="computeroutput"><span class="special">!</span> </code><a class="link" href="reference.html#group__predicates_1gabf9c4e76dd8a09a4c476f2f8fa8a0e4d">boost::geometry::index::within()</a></code>
</li>
<li class="listitem">
- <code class="literal"><a class="link" href="reference.html#group__predicates_1ga5c93efac97377136564623cbaf35d880">boost::geometry::index::value()</a></code>.
+ <code class="literal"><a class="link" href="reference.html#group__predicates_1ga8acb81106fce01da72f310184ab4d9ce">boost::geometry::index::value()</a></code>.
</li>
</ul></div>
<p>
@@ -3460,7 +3460,7 @@
<code class="literal"><code class="computeroutput"><span class="special">!</span> </code><a class="link" href="reference.html#group__predicates_1gabf9c4e76dd8a09a4c476f2f8fa8a0e4d">boost::geometry::index::within()</a></code>
</li>
<li class="listitem">
- <code class="literal"><a class="link" href="reference.html#group__predicates_1ga5c93efac97377136564623cbaf35d880">boost::geometry::index::value()</a></code>.
+ <code class="literal"><a class="link" href="reference.html#group__predicates_1ga8acb81106fce01da72f310184ab4d9ce">boost::geometry::index::value()</a></code>.
</li>
</ul></div>
<p>
@@ -5902,7 +5902,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="id947454"></a><a class="indexterm" name="id947459"></a><a class="indexterm" name="id947464"></a><a class="indexterm" name="id947469"></a>
+ <a class="indexterm" name="id924517"></a><a class="indexterm" name="id924521"></a><a class="indexterm" name="id924526"></a><a class="indexterm" name="id924531"></a>
Linear r-tree creation algorithm parameters.
</p>
<h6>
@@ -5977,7 +5977,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="id947763"></a><a class="indexterm" name="id947767"></a><a class="indexterm" name="id947772"></a><a class="indexterm" name="id947777"></a>
+ <a class="indexterm" name="id924825"></a><a class="indexterm" name="id924830"></a><a class="indexterm" name="id924835"></a><a class="indexterm" name="id924839"></a>
Quadratic r-tree creation algorithm parameters.
</p>
<h6>
@@ -6052,7 +6052,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="id948071"></a><a class="indexterm" name="id948076"></a><a class="indexterm" name="id948081"></a><a class="indexterm" name="id948085"></a>
+ <a class="indexterm" name="id925133"></a><a class="indexterm" name="id925138"></a><a class="indexterm" name="id925143"></a><a class="indexterm" name="id925148"></a>
R*-tree creation algorithm parameters.
</p>
<h6>
@@ -6156,7 +6156,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="id948505"></a><a class="indexterm" name="id948510"></a><a class="indexterm" name="id948515"></a><a class="indexterm" name="id948520"></a><a class="indexterm" name="id948525"></a>
+ <a class="indexterm" name="id925568"></a><a class="indexterm" name="id925573"></a><a class="indexterm" name="id925577"></a><a class="indexterm" name="id925582"></a><a class="indexterm" name="id925587"></a>
Linear r-tree creation algorithm parameters.
</p>
<h6>
@@ -6292,7 +6292,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="id948983"></a><a class="indexterm" name="id948988"></a><a class="indexterm" name="id948993"></a><a class="indexterm" name="id948997"></a><a class="indexterm" name="id949002"></a>
+ <a class="indexterm" name="id926045"></a><a class="indexterm" name="id926050"></a><a class="indexterm" name="id926055"></a><a class="indexterm" name="id926060"></a><a class="indexterm" name="id926065"></a>
Quadratic r-tree creation algorithm parameters.
</p>
<h6>
@@ -6428,7 +6428,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="id951241"></a><a class="indexterm" name="id951246"></a><a class="indexterm" name="id951250"></a><a class="indexterm" name="id951255"></a><a class="indexterm" name="id951260"></a>
+ <a class="indexterm" name="id928303"></a><a class="indexterm" name="id928308"></a><a class="indexterm" name="id928313"></a><a class="indexterm" name="id928318"></a><a class="indexterm" name="id928322"></a>
R*-tree creation algorithm parameters.
</p>
<h6>
@@ -6629,31 +6629,6 @@
<tr>
<td>
<p>
- <a class="link" href="reference.html#group__predicates_1ga150fd87dc53e5472f8905bb5827428e2"><code class="computeroutput"><span class="identifier">empty</span><span class="special">()</span></code></a>
- </p>
- </td>
-<td>
- <p>
- Generate empty predicate.
- </p>
- </td>
-</tr>
-<tr>
-<td>
- <p>
- <a class="link" href="reference.html#group__predicates_1ga5c93efac97377136564623cbaf35d880"><code class="computeroutput"><span class="identifier">value</span><span class="special">(</span><span class="identifier">ValuePredicate</span> <span class="keyword">const</span>
- <span class="special">&)</span></code></a>
- </p>
- </td>
-<td>
- <p>
- Generate value predicate.
- </p>
- </td>
-</tr>
-<tr>
-<td>
- <p>
<a class="link" href="reference.html#group__predicates_1ga0a613a7f1d18ac33955bfdc2c5777c61"><code class="computeroutput"><span class="identifier">covered_by</span><span class="special">(</span><span class="identifier">Geometry</span> <span class="keyword">const</span>
<span class="special">&)</span></code></a>
</p>
@@ -6721,48 +6696,48 @@
</p>
</td>
</tr>
+<tr>
+<td>
+ <p>
+ <a class="link" href="reference.html#group__predicates_1ga8acb81106fce01da72f310184ab4d9ce"><code class="computeroutput"><span class="identifier">value</span><span class="special">(</span><span class="identifier">Fun</span> <span class="keyword">const</span>
+ <span class="special">&)</span></code></a>
+ </p>
+ </td>
+<td>
+ <p>
+ Generate value predicate.
+ </p>
+ </td>
+</tr>
</tbody>
</table></div>
<div class="section">
<div class="titlepage"><div><div><h5 class="title">
-<a name="geometry_index.r_tree.reference.group__predicates.empty__"></a><a name="group__predicates_1ga150fd87dc53e5472f8905bb5827428e2"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.empty__" title="empty()">empty()</a>
-</h5></div></div></div>
-<p>
- Generate empty predicate.
- </p>
-<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.empty__.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.empty__.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.empty__.synopsis">Synopsis</a>
- </h6>
-<pre class="programlisting"><code class="computeroutput"><span class="identifier">detail</span><span class="special">::</span><span class="identifier">empty</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">empty</span></code><code class="computeroutput"><span class="special">()</span></code>
-</pre>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___"></a><a name="group__predicates_1ga5c93efac97377136564623cbaf35d880"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___" title="value(ValuePredicate const &)">value(ValuePredicate
+<a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___"></a><a name="group__predicates_1ga0a613a7f1d18ac33955bfdc2c5777c61"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___" title="covered_by(Geometry const &)">covered_by(Geometry
const &)</a>
</h5></div></div></div>
<p>
- Generate value predicate.
+ Generate <code class="literal"><a class="link" href="reference.html#group__predicates_1ga0a613a7f1d18ac33955bfdc2c5777c61">covered_by()</a></code>
+ predicate.
</p>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___.description">Description</a>
+<a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.h0"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.description">Description</a>
</h6>
<p>
- A wrapper around user-defined functor describing if Value should be returned
- by spatial query.
+ Generate a predicate defining Value and Geometry relationship. Value
+ will be returned by the query if <code class="literal"><code class="computeroutput"><span class="identifier">bg</span><span class="special">::</span><span class="identifier">covered_by</span><span class="special">(</span><span class="identifier">Indexable</span><span class="special">,</span> <span class="identifier">Geometry</span><span class="special">)</span></code></code> returns true.
</p>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___.h1"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___.synopsis">Synopsis</a>
+<a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.h1"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.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">ValuePredicate</span></code><code class="computeroutput"><span class="special">></span></code>
-<code class="computeroutput"><span class="identifier">detail</span><span class="special">::</span><span class="identifier">value</span><span class="special"><</span><span class="identifier">ValuePredicate</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">value</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">ValuePredicate</span> <span class="keyword">const</span> <span class="special">&</span></code> <code class="computeroutput"><span class="identifier">vpred</span></code><code class="computeroutput"><span class="special">)</span></code>
+<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">Geometry</span></code><code class="computeroutput"><span class="special">></span></code>
+<code class="computeroutput"><span class="identifier">detail</span><span class="special">::</span><span class="identifier">covered_by</span><span class="special"><</span><span class="identifier">Geometry</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">covered_by</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">Geometry</span> <span class="keyword">const</span> <span class="special">&</span></code> <code class="computeroutput"><span class="identifier">g</span></code><code class="computeroutput"><span class="special">)</span></code>
</pre>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___.h2"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___.template_parameter_s_">Template
+<a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.h2"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.template_parameter_s_">Template
parameter(s)</a>
</h6>
<div class="informaltable"><table class="table">
@@ -6785,19 +6760,19 @@
<tbody><tr>
<td>
<p>
- <code class="computeroutput"><span class="identifier">ValuePredicate</span></code>
+ <code class="computeroutput"><span class="identifier">Geometry</span></code>
</p>
</td>
<td>
<p>
- Functor type.
+ The Geometry type.
</p>
</td>
</tr></tbody>
</table></div>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___.h3"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___.parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.value_valuepredicate_const___.parameter_s_">Parameter(s)</a>
+<a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.h3"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.parameter_s_">Parameter(s)</a>
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -6825,17 +6800,18 @@
<tbody><tr>
<td>
<p>
- <code class="computeroutput"><span class="identifier">ValuePredicate</span> <span class="keyword">const</span> <span class="special">&</span></code>
+ <code class="computeroutput"><span class="identifier">Geometry</span> <span class="keyword">const</span>
+ <span class="special">&</span></code>
</p>
</td>
<td>
<p>
- <code class="computeroutput"><span class="identifier">vpred</span></code>
+ <code class="computeroutput"><span class="identifier">g</span></code>
</p>
</td>
<td>
<p>
- The functor.
+ The Geometry object.
</p>
</td>
</tr></tbody>
@@ -6843,31 +6819,31 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h5 class="title">
-<a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___"></a><a name="group__predicates_1ga0a613a7f1d18ac33955bfdc2c5777c61"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___" title="covered_by(Geometry const &)">covered_by(Geometry
+<a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___"></a><a name="group__predicates_1ga351bb3b82e019ff45adf789385b8007d"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___" title="disjoint(Geometry const &)">disjoint(Geometry
const &)</a>
</h5></div></div></div>
<p>
- Generate <code class="literal"><a class="link" href="reference.html#group__predicates_1ga0a613a7f1d18ac33955bfdc2c5777c61">covered_by()</a></code>
+ Generate <code class="literal"><a class="link" href="reference.html#group__predicates_1ga351bb3b82e019ff45adf789385b8007d">disjoint()</a></code>
predicate.
</p>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.description">Description</a>
+<a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.h0"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.description">Description</a>
</h6>
<p>
Generate a predicate defining Value and Geometry relationship. Value
- will be returned by the query if <code class="literal"><code class="computeroutput"><span class="identifier">bg</span><span class="special">::</span><span class="identifier">covered_by</span><span class="special">(</span><span class="identifier">Indexable</span><span class="special">,</span> <span class="identifier">Geometry</span><span class="special">)</span></code></code> returns true.
+ will be returned by the query if <code class="literal"><code class="computeroutput"><span class="identifier">bg</span><span class="special">::</span><span class="identifier">disjoint</span><span class="special">(</span><span class="identifier">Indexable</span><span class="special">,</span> <span class="identifier">Geometry</span><span class="special">)</span></code></code> returns true.
</p>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.h1"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.synopsis">Synopsis</a>
+<a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.h1"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.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">Geometry</span></code><code class="computeroutput"><span class="special">></span></code>
-<code class="computeroutput"><span class="identifier">detail</span><span class="special">::</span><span class="identifier">covered_by</span><span class="special"><</span><span class="identifier">Geometry</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">covered_by</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">Geometry</span> <span class="keyword">const</span> <span class="special">&</span></code> <code class="computeroutput"><span class="identifier">g</span></code><code class="computeroutput"><span class="special">)</span></code>
+<code class="computeroutput"><span class="identifier">detail</span><span class="special">::</span><span class="identifier">disjoint</span><span class="special"><</span><span class="identifier">Geometry</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">disjoint</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">Geometry</span> <span class="keyword">const</span> <span class="special">&</span></code> <code class="computeroutput"><span class="identifier">g</span></code><code class="computeroutput"><span class="special">)</span></code>
</pre>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.h2"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.template_parameter_s_">Template
+<a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.h2"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.template_parameter_s_">Template
parameter(s)</a>
</h6>
<div class="informaltable"><table class="table">
@@ -6901,8 +6877,8 @@
</tr></tbody>
</table></div>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.h3"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.covered_by_geometry_const___.parameter_s_">Parameter(s)</a>
+<a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.h3"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.parameter_s_">Parameter(s)</a>
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -6949,31 +6925,31 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h5 class="title">
-<a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___"></a><a name="group__predicates_1ga351bb3b82e019ff45adf789385b8007d"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___" title="disjoint(Geometry const &)">disjoint(Geometry
+<a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___"></a><a name="group__predicates_1ga7301c50e0272976b9f1434536383e6d0"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___" title="intersects(Geometry const &)">intersects(Geometry
const &)</a>
</h5></div></div></div>
<p>
- Generate <code class="literal"><a class="link" href="reference.html#group__predicates_1ga351bb3b82e019ff45adf789385b8007d">disjoint()</a></code>
+ Generate <code class="literal"><a class="link" href="reference.html#group__predicates_1ga7301c50e0272976b9f1434536383e6d0">intersects()</a></code>
predicate.
</p>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.description">Description</a>
+<a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.h0"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.description">Description</a>
</h6>
<p>
Generate a predicate defining Value and Geometry relationship. Value
- will be returned by the query if <code class="literal"><code class="computeroutput"><span class="identifier">bg</span><span class="special">::</span><span class="identifier">disjoint</span><span class="special">(</span><span class="identifier">Indexable</span><span class="special">,</span> <span class="identifier">Geometry</span><span class="special">)</span></code></code> returns true.
+ will be returned by the query if <code class="literal"><code class="computeroutput"><span class="identifier">bg</span><span class="special">::</span><span class="identifier">intersects</span><span class="special">(</span><span class="identifier">Indexable</span><span class="special">,</span> <span class="identifier">Geometry</span><span class="special">)</span></code></code> returns true.
</p>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.h1"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.synopsis">Synopsis</a>
+<a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.h1"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.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">Geometry</span></code><code class="computeroutput"><span class="special">></span></code>
-<code class="computeroutput"><span class="identifier">detail</span><span class="special">::</span><span class="identifier">disjoint</span><span class="special"><</span><span class="identifier">Geometry</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">disjoint</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">Geometry</span> <span class="keyword">const</span> <span class="special">&</span></code> <code class="computeroutput"><span class="identifier">g</span></code><code class="computeroutput"><span class="special">)</span></code>
+<code class="computeroutput"><span class="identifier">detail</span><span class="special">::</span><span class="identifier">intersects</span><span class="special"><</span><span class="identifier">Geometry</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">intersects</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">Geometry</span> <span class="keyword">const</span> <span class="special">&</span></code> <code class="computeroutput"><span class="identifier">g</span></code><code class="computeroutput"><span class="special">)</span></code>
</pre>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.h2"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.template_parameter_s_">Template
+<a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.h2"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.template_parameter_s_">Template
parameter(s)</a>
</h6>
<div class="informaltable"><table class="table">
@@ -7007,8 +6983,8 @@
</tr></tbody>
</table></div>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.h3"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.disjoint_geometry_const___.parameter_s_">Parameter(s)</a>
+<a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.h3"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.parameter_s_">Parameter(s)</a>
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -7055,31 +7031,31 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h5 class="title">
-<a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___"></a><a name="group__predicates_1ga7301c50e0272976b9f1434536383e6d0"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___" title="intersects(Geometry const &)">intersects(Geometry
+<a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___"></a><a name="group__predicates_1ga5511236f56be1defcccbf11e742ccd88"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___" title="overlaps(Geometry const &)">overlaps(Geometry
const &)</a>
</h5></div></div></div>
<p>
- Generate <code class="literal"><a class="link" href="reference.html#group__predicates_1ga7301c50e0272976b9f1434536383e6d0">intersects()</a></code>
+ Generate <code class="literal"><a class="link" href="reference.html#group__predicates_1ga5511236f56be1defcccbf11e742ccd88">overlaps()</a></code>
predicate.
</p>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.description">Description</a>
+<a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.h0"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.description">Description</a>
</h6>
<p>
Generate a predicate defining Value and Geometry relationship. Value
- will be returned by the query if <code class="literal"><code class="computeroutput"><span class="identifier">bg</span><span class="special">::</span><span class="identifier">intersects</span><span class="special">(</span><span class="identifier">Indexable</span><span class="special">,</span> <span class="identifier">Geometry</span><span class="special">)</span></code></code> returns true.
+ will be returned by the query if <code class="literal"><code class="computeroutput"><span class="identifier">bg</span><span class="special">::</span><span class="identifier">overlaps</span><span class="special">(</span><span class="identifier">Indexable</span><span class="special">,</span> <span class="identifier">Geometry</span><span class="special">)</span></code></code> returns true.
</p>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.h1"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.synopsis">Synopsis</a>
+<a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.h1"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.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">Geometry</span></code><code class="computeroutput"><span class="special">></span></code>
-<code class="computeroutput"><span class="identifier">detail</span><span class="special">::</span><span class="identifier">intersects</span><span class="special"><</span><span class="identifier">Geometry</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">intersects</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">Geometry</span> <span class="keyword">const</span> <span class="special">&</span></code> <code class="computeroutput"><span class="identifier">g</span></code><code class="computeroutput"><span class="special">)</span></code>
+<code class="computeroutput"><span class="identifier">detail</span><span class="special">::</span><span class="identifier">overlaps</span><span class="special"><</span><span class="identifier">Geometry</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">overlaps</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">Geometry</span> <span class="keyword">const</span> <span class="special">&</span></code> <code class="computeroutput"><span class="identifier">g</span></code><code class="computeroutput"><span class="special">)</span></code>
</pre>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.h2"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.template_parameter_s_">Template
+<a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.h2"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.template_parameter_s_">Template
parameter(s)</a>
</h6>
<div class="informaltable"><table class="table">
@@ -7113,8 +7089,8 @@
</tr></tbody>
</table></div>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.h3"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.intersects_geometry_const___.parameter_s_">Parameter(s)</a>
+<a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.h3"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.parameter_s_">Parameter(s)</a>
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -7161,31 +7137,31 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h5 class="title">
-<a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___"></a><a name="group__predicates_1ga5511236f56be1defcccbf11e742ccd88"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___" title="overlaps(Geometry const &)">overlaps(Geometry
+<a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___"></a><a name="group__predicates_1gabf9c4e76dd8a09a4c476f2f8fa8a0e4d"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.within_geometry_const___" title="within(Geometry const &)">within(Geometry
const &)</a>
</h5></div></div></div>
<p>
- Generate <code class="literal"><a class="link" href="reference.html#group__predicates_1ga5511236f56be1defcccbf11e742ccd88">overlaps()</a></code>
+ Generate <code class="literal"><a class="link" href="reference.html#group__predicates_1gabf9c4e76dd8a09a4c476f2f8fa8a0e4d">within()</a></code>
predicate.
</p>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.description">Description</a>
+<a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.h0"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.within_geometry_const___.description">Description</a>
</h6>
<p>
Generate a predicate defining Value and Geometry relationship. Value
- will be returned by the query if <code class="literal"><code class="computeroutput"><span class="identifier">bg</span><span class="special">::</span><span class="identifier">overlaps</span><span class="special">(</span><span class="identifier">Indexable</span><span class="special">,</span> <span class="identifier">Geometry</span><span class="special">)</span></code></code> returns true.
+ will be returned by the query if <code class="literal"><code class="computeroutput"><span class="identifier">bg</span><span class="special">::</span><span class="identifier">within</span><span class="special">(</span><span class="identifier">Indexable</span><span class="special">,</span> <span class="identifier">Geometry</span><span class="special">)</span></code></code> returns true.
</p>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.h1"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.synopsis">Synopsis</a>
+<a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.h1"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.within_geometry_const___.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">Geometry</span></code><code class="computeroutput"><span class="special">></span></code>
-<code class="computeroutput"><span class="identifier">detail</span><span class="special">::</span><span class="identifier">overlaps</span><span class="special"><</span><span class="identifier">Geometry</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">overlaps</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">Geometry</span> <span class="keyword">const</span> <span class="special">&</span></code> <code class="computeroutput"><span class="identifier">g</span></code><code class="computeroutput"><span class="special">)</span></code>
+<code class="computeroutput"><span class="identifier">detail</span><span class="special">::</span><span class="identifier">within</span><span class="special"><</span><span class="identifier">Geometry</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">within</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">Geometry</span> <span class="keyword">const</span> <span class="special">&</span></code> <code class="computeroutput"><span class="identifier">g</span></code><code class="computeroutput"><span class="special">)</span></code>
</pre>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.h2"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.template_parameter_s_">Template
+<a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.h2"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.within_geometry_const___.template_parameter_s_">Template
parameter(s)</a>
</h6>
<div class="informaltable"><table class="table">
@@ -7219,8 +7195,8 @@
</tr></tbody>
</table></div>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.h3"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.overlaps_geometry_const___.parameter_s_">Parameter(s)</a>
+<a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.h3"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.within_geometry_const___.parameter_s_">Parameter(s)</a>
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -7267,31 +7243,30 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h5 class="title">
-<a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___"></a><a name="group__predicates_1gabf9c4e76dd8a09a4c476f2f8fa8a0e4d"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.within_geometry_const___" title="within(Geometry const &)">within(Geometry
+<a name="geometry_index.r_tree.reference.group__predicates.value_fun_const___"></a><a name="group__predicates_1ga8acb81106fce01da72f310184ab4d9ce"></a><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.value_fun_const___" title="value(Fun const &)">value(Fun
const &)</a>
</h5></div></div></div>
<p>
- Generate <code class="literal"><a class="link" href="reference.html#group__predicates_1gabf9c4e76dd8a09a4c476f2f8fa8a0e4d">within()</a></code>
- predicate.
+ Generate value predicate.
</p>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.h0"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.within_geometry_const___.description">Description</a>
+<a name="geometry_index.r_tree.reference.group__predicates.value_fun_const___.h0"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.value_fun_const___.description"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.value_fun_const___.description">Description</a>
</h6>
<p>
- Generate a predicate defining Value and Geometry relationship. Value
- will be returned by the query if <code class="literal"><code class="computeroutput"><span class="identifier">bg</span><span class="special">::</span><span class="identifier">within</span><span class="special">(</span><span class="identifier">Indexable</span><span class="special">,</span> <span class="identifier">Geometry</span><span class="special">)</span></code></code> returns true.
+ A wrapper around user-defined functor describing if Value should be returned
+ by spatial query.
</p>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.h1"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.within_geometry_const___.synopsis">Synopsis</a>
+<a name="geometry_index.r_tree.reference.group__predicates.value_fun_const___.h1"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.value_fun_const___.synopsis"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.value_fun_const___.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">Geometry</span></code><code class="computeroutput"><span class="special">></span></code>
-<code class="computeroutput"><span class="identifier">detail</span><span class="special">::</span><span class="identifier">within</span><span class="special"><</span><span class="identifier">Geometry</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">within</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">Geometry</span> <span class="keyword">const</span> <span class="special">&</span></code> <code class="computeroutput"><span class="identifier">g</span></code><code class="computeroutput"><span class="special">)</span></code>
+<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">Fun</span></code><code class="computeroutput"><span class="special">></span></code>
+<code class="computeroutput"><span class="identifier">detail</span><span class="special">::</span><span class="identifier">value</span><span class="special"><</span><span class="identifier">Fun</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">value</span></code><code class="computeroutput"><span class="special">(</span></code><code class="computeroutput"><span class="identifier">Fun</span> <span class="keyword">const</span> <span class="special">&</span></code> <code class="computeroutput"><span class="identifier">fun</span></code><code class="computeroutput"><span class="special">)</span></code>
</pre>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.h2"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.within_geometry_const___.template_parameter_s_">Template
+<a name="geometry_index.r_tree.reference.group__predicates.value_fun_const___.h2"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.value_fun_const___.template_parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.value_fun_const___.template_parameter_s_">Template
parameter(s)</a>
</h6>
<div class="informaltable"><table class="table">
@@ -7314,19 +7289,19 @@
<tbody><tr>
<td>
<p>
- <code class="computeroutput"><span class="identifier">Geometry</span></code>
+ <code class="computeroutput"><span class="identifier">Fun</span></code>
</p>
</td>
<td>
<p>
- The Geometry type.
+ Functor type.
</p>
</td>
</tr></tbody>
</table></div>
<h6>
-<a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.h3"></a>
- <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.within_geometry_const___.parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.within_geometry_const___.parameter_s_">Parameter(s)</a>
+<a name="geometry_index.r_tree.reference.group__predicates.value_fun_const___.h3"></a>
+ <span class="phrase"><a name="geometry_index.r_tree.reference.group__predicates.value_fun_const___.parameter_s_"></a></span><a class="link" href="reference.html#geometry_index.r_tree.reference.group__predicates.value_fun_const___.parameter_s_">Parameter(s)</a>
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -7354,18 +7329,18 @@
<tbody><tr>
<td>
<p>
- <code class="computeroutput"><span class="identifier">Geometry</span> <span class="keyword">const</span>
+ <code class="computeroutput"><span class="identifier">Fun</span> <span class="keyword">const</span>
<span class="special">&</span></code>
</p>
</td>
<td>
<p>
- <code class="computeroutput"><span class="identifier">g</span></code>
+ <code class="computeroutput"><span class="identifier">fun</span></code>
</p>
</td>
<td>
<p>
- The Geometry object.
+ The functor.
</p>
</td>
</tr></tbody>
@@ -8760,7 +8735,7 @@
<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="id963289"></a><a class="indexterm" name="id963294"></a><a class="indexterm" name="id963299"></a><a class="indexterm" name="id963304"></a><a class="indexterm" name="id963308"></a>
+ <a class="indexterm" name="id940233"></a><a class="indexterm" name="id940238"></a><a class="indexterm" name="id940242"></a><a class="indexterm" name="id940247"></a><a class="indexterm" name="id940252"></a>
The default translator.
</p>
<h6>
@@ -8830,7 +8805,7 @@
<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="id963778"></a><a class="indexterm" name="id963783"></a><a class="indexterm" name="id963787"></a><a class="indexterm" name="id963792"></a><a class="indexterm" name="id963797"></a>
+ <a class="indexterm" name="id940721"></a><a class="indexterm" name="id940726"></a><a class="indexterm" name="id940731"></a><a class="indexterm" name="id940736"></a><a class="indexterm" name="id940741"></a>
The index translator.
</p>
<h6>
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-01-24 08:51:01 EST (Thu, 24 Jan 2013)
@@ -52,7 +52,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: January 19, 2013 at 02:30:02 GMT</small></p></td>
+<td align="left"><p><small>Last revised: January 24, 2013 at 13:47:55 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>
Modified: sandbox-branches/geometry/index/tests/additional_speed.cpp
==============================================================================
--- sandbox-branches/geometry/index/tests/additional_speed.cpp (original)
+++ sandbox-branches/geometry/index/tests/additional_speed.cpp 2013-01-24 08:51:01 EST (Thu, 24 Jan 2013)
@@ -85,7 +85,6 @@
result.reserve(100);
B result_one;
- // query test
{
tim.restart();
size_t temp = 0;
@@ -101,9 +100,47 @@
std::cout << time << "s - spatial_query(B) " << queries_count << " found " << temp << '\n';
}
+ {
+ tim.restart();
+ size_t temp = 0;
+ for (size_t i = 0 ; i < queries_count / 2 ; ++i )
+ {
+ float x1 = coords[i].first;
+ float y1 = coords[i].second;
+ float x2 = coords[i+1].first;
+ float y2 = coords[i+1].second;
+ float x3 = coords[i+2].first;
+ float y3 = coords[i+2].second;
+ result.clear();
+ t.spatial_query(
+ boost::make_tuple(
+ bgi::intersects(B(P(x1 - 10, y1 - 10), P(x1 + 10, y1 + 10))),
+ !bgi::within(B(P(x2 - 10, y2 - 10), P(x2 + 10, y2 + 10))),
+ !bgi::overlaps(B(P(x3 - 10, y3 - 10), P(x3 + 10, y3 + 10)))
+ ),
+ std::back_inserter(result)
+ );
+ temp += result.size();
+ }
+ double time = tim.elapsed();
+ std::cout << time << "s - spatial_query(i, !w, !o) " << queries_count << " found " << temp << '\n';
+ }
+
result.clear();
- // searching test
+ {
+ tim.restart();
+ size_t temp = 0;
+ for (size_t i = 0 ; i < queries_count / 10 ; ++i )
+ {
+ float x = coords[i].first + 100;
+ float y = coords[i].second + 100;
+ temp += t.nearest_query(P(x, y), result_one);
+ }
+ double time = tim.elapsed();
+ std::cout << time << "s - nearest_query(P) " << (queries_count / 10) << " found " << temp << '\n';
+ }
+
{
tim.restart();
size_t temp = 0;
@@ -125,13 +162,21 @@
{
float x = coords[i].first + 100;
float y = coords[i].second + 100;
- temp += t.nearest_query(P(x, y), result_one);
+ result.clear();
+ temp += t.nearest_query(
+ bgi::bounded(
+ bgi::to_nearest(P(x, y)),
+ bgi::to_centroid(0),
+ bgi::to_furthest(100000)
+ ),
+ 5,
+ std::back_inserter(result)
+ );
}
double time = tim.elapsed();
- std::cout << time << "s - nearest_query(P) " << (queries_count / 10) << " found " << temp << '\n';
+ std::cout << time << "s - nearest_query(bounded(n, c, f), 5) " << (queries_count / 10) << " found " << temp << '\n';
}
- // inserting test
{
tim.restart();
for (size_t i = 0 ; i < values_count / 10 ; ++i )
@@ -145,6 +190,8 @@
double time = tim.elapsed();
std::cout << time << "s - remove " << values_count / 10 << '\n';
}
+
+ std::cout << "------------------------------------------------\n";
}
return 0;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk