boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-11 11:52:11 +00:00
Code Issues Projects Releases Wiki Activity

templates and functions parameters changed in filters and rtree's functions to suit new distances predicates.

Browse Source 
[SVN r74594]
This commit is contained in:
Adam Wulkiewicz
2011-09-27 19:43:13 +00:00
parent e42f8b61c5
commit cfc5335ccc
3 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/boost/geometry/extensions/index/filters/nearest_filter.hpp
View File

@@ -23,10 +23,10 @@ class nearest_filter
typedef int* iterator;
typedef const int* const_iterator;
template <typename Point, typename Predicates>
template <typename DistancesPredicates, typename Predicates>
inline nearest_filter(
Index const&,
Point const&,
DistancesPredicates const&,
size_t,
Predicates const&
)
@@ -40,42 +40,42 @@ class nearest_filter
namespace detail {
template<typename Point, typename Predicates>
template<typename DistancesPredicates, typename Predicates>
struct nearest_filtered
{
inline nearest_filtered(
Point const& pt,
DistancesPredicates const& dpred,
size_t k,
Predicates const& pred
)
: point(pt)
: distances_predicates(dpred)
, count(k)
, predicates(pred)
{}
Point const& point;
DistancesPredicates const& distances_predicates;
size_t count;
Predicates const& predicates;
};
} // namespace detail
template <typename Point, typename Predicates>
detail::nearest_filtered<Point, Predicates> nearest_filtered(
Point const& pt,
template <typename DistancesPredicates, typename Predicates>
detail::nearest_filtered<DistancesPredicates, Predicates> nearest_filtered(
DistancesPredicates const& dpred,
size_t k,
Predicates const& pred = detail::empty())
{
return detail::nearest_filtered<Point, Predicates>(pt, k, pred);
return detail::nearest_filtered<DistancesPredicates, Predicates>(dpred, k, pred);
}
template<typename Index, typename Point, typename Predicates>
template<typename Index, typename DistancesPredicates, typename Predicates>
index::nearest_filter<Index>
operator|(
Index const& si,
detail::nearest_filtered<Point, Predicates> const& f)
detail::nearest_filtered<DistancesPredicates, Predicates> const& f)
{
return index::nearest_filter<Index>(si, f.point, f.count, f.predicates);
return index::nearest_filter<Index>(si, f.distances_predicates, f.count, f.predicates);
}
}}} // namespace boost::geometry::index

6
include/boost/geometry/extensions/index/rtree/filters.hpp
View File

@@ -55,15 +55,15 @@ public:
typedef typename result_type::iterator iterator;
typedef typename result_type::const_iterator const_iterator;
template <typename Point, typename Predicates>
template <typename DistancesPredicates, typename Predicates>
inline nearest_filter(
index::rtree<Value, Options, Translator> const& rtree,
Point const& pt,
DistancesPredicates const& dpred,
size_t k,
Predicates const& pred
)
{
rtree.nearest(pt, k, pred, std::back_inserter(m_result));
rtree.nearest(dpred, k, pred, std::back_inserter(m_result));
}
inline iterator begin() { return m_result.begin(); }

48
include/boost/geometry/extensions/index/rtree/rtree.hpp
View File

@@ -96,27 +96,27 @@ public:
// return number of elements instead of bool?
template <typename DistancePredicate>
inline size_t nearest(DistancePredicate const& p, value_type & v) const
inline size_t nearest(DistancePredicate const& dpred, value_type & v) const
{
return nearest_one(p, detail::empty(), v);
return nearest_one(dpred, detail::empty(), v);
}
template <typename DistancePredicate, typename Predicates>
inline size_t nearest(DistancePredicate const& p, Predicates const& pred, value_type & v) const
inline size_t nearest(DistancePredicate const& dpred, Predicates const& pred, value_type & v) const
{
return nearest_one(p, pred, v);
return nearest_one(dpred, pred, v);
}
template <typename DistancePredicate, typename OutIter>
inline size_t nearest(DistancePredicate const& p, size_t k, OutIter out_it) const
inline size_t nearest(DistancePredicate const& dpred, size_t k, OutIter out_it) const
{
return nearest_k(p, k, detail::empty(), out_it);
return nearest_k(dpred, k, detail::empty(), out_it);
}
template <typename DistancePredicate, typename Predicates, typename OutIter>
inline size_t nearest(DistancePredicate const& p, size_t k, Predicates const& pred, OutIter out_it) const
inline size_t nearest(DistancePredicate const& dpred, size_t k, Predicates const& pred, OutIter out_it) const
{
return nearest_k(p, k, pred, out_it);
return nearest_k(dpred, k, pred, out_it);
}
inline void insert(value_type const& value)
@@ -189,7 +189,7 @@ public:
private:
template <typename DistancesPredicates, typename Predicates>
inline size_t nearest_one(DistancesPredicates const& p, Predicates const& pred, value_type & v) const
inline size_t nearest_one(DistancesPredicates const& dpred, Predicates const& pred, value_type & v) const
{
typedef typename detail::point_relation<DistancesPredicates>::type point_relation;
typedef typename detail::relation<point_relation>::value_type point_type;
@@ -210,7 +210,7 @@ private:
DistancesPredicates,
Predicates,
result_type
> nearest_v(m_translator, p, pred, result);
> nearest_v(m_translator, dpred, pred, result);
detail::rtree::apply_visitor(nearest_v, *m_root);
@@ -218,7 +218,7 @@ private:
}
template <typename DistancesPredicates, typename Predicates, typename OutIter>
inline size_t nearest_k(DistancesPredicates const& p, size_t k, Predicates const& pred, OutIter out_it) const
inline size_t nearest_k(DistancesPredicates const& dpred, size_t k, Predicates const& pred, OutIter out_it) const
{
typedef typename detail::point_relation<DistancesPredicates>::type point_relation;
typedef typename detail::relation<point_relation>::value_type point_type;
@@ -239,7 +239,7 @@ private:
DistancesPredicates,
Predicates,
result_type
> nearest_v(m_translator, p, pred, result);
> nearest_v(m_translator, dpred, pred, result);
detail::rtree::apply_visitor(nearest_v, *m_root);
@@ -270,28 +270,28 @@ inline size_t query(rtree<Value, Options, Translator> const& tree, Predicates co
return tree.query(pred, out_it);
}
template <typename Value, typename Options, typename Translator, typename Point>
inline size_t nearest(rtree<Value, Options, Translator> const& tree, Point const& pt, Value & v)
template <typename Value, typename Options, typename Translator, typename DistancesPredicates>
inline size_t nearest(rtree<Value, Options, Translator> const& tree, DistancesPredicates const& dpred, Value & v)
{
return tree.nearest(pt, v);
return tree.nearest(dpred, v);
}
template <typename Value, typename Options, typename Translator, typename Point, typename Predicates>
inline size_t nearest(rtree<Value, Options, Translator> const& tree, Point const& pt, Predicates const& pred, Value & v)
template <typename Value, typename Options, typename Translator, typename DistancesPredicates, typename Predicates>
inline size_t nearest(rtree<Value, Options, Translator> const& tree, DistancesPredicates const& dpred, Predicates const& pred, Value & v)
{
return tree.nearest(pt, pred, v);
return tree.nearest(dpred, pred, v);
}
template <typename Value, typename Options, typename Translator, typename Point, typename OutIter>
inline size_t nearest(rtree<Value, Options, Translator> const& tree, Point const& pt, size_t k, OutIter out_it)
template <typename Value, typename Options, typename Translator, typename DistancesPredicates, typename OutIter>
inline size_t nearest(rtree<Value, Options, Translator> const& tree, DistancesPredicates const& dpred, size_t k, OutIter out_it)
{
return tree.nearest(pt, k, out_it);
return tree.nearest(dpred, k, out_it);
}
template <typename Value, typename Options, typename Translator, typename Point, typename Predicates, typename OutIter>
inline size_t nearest(rtree<Value, Options, Translator> const& tree, Point const& pt, size_t k, Predicates const& pred, OutIter out_it)
template <typename Value, typename Options, typename Translator, typename DistancesPredicates, typename Predicates, typename OutIter>
inline size_t nearest(rtree<Value, Options, Translator> const& tree, DistancesPredicates const& dpred, size_t k, Predicates const& pred, OutIter out_it)
{
return tree.nearest(pt, k, pred, out_it);
return tree.nearest(dpred, k, pred, out_it);
}
template <typename Value, typename Options, typename Translator>