Subject: [Boost-commit] svn:boost r74439 - in sandbox-branches/geometry/index/boost/geometry/extensions/index: algorithms rtree/visitors
From: adam.wulkiewicz_at_[hidden]
Date: 2011-09-17 15:47:02
Author: awulkiew
Date: 2011-09-17 15:47:01 EDT (Sat, 17 Sep 2011)
New Revision: 74439
URL: http://svn.boost.org/trac/boost/changeset/74439
Log:
namespace names error fixed
Text files modified:
sandbox-branches/geometry/index/boost/geometry/extensions/index/algorithms/maxdist.hpp | 4 ++--
sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/visitors/nearest.hpp | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/algorithms/maxdist.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/algorithms/maxdist.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/algorithms/maxdist.hpp 2011-09-17 15:47:01 EDT (Sat, 17 Sep 2011)
@@ -55,11 +55,11 @@
typename geometry::default_distance_result<Point, Indexable>::type
maxdist(Point const& pt, Indexable const& i)
{
- return sum_for_indexable<
+ return detail::sum_for_indexable<
Point,
Indexable,
typename index::traits::tag<Indexable>::type,
- maxdist_tag,
+ detail::maxdist_tag,
index::traits::dimension<Indexable>::value
>::apply(pt, i);
}
Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/visitors/nearest.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/visitors/nearest.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/visitors/nearest.hpp 2011-09-17 15:47:01 EDT (Sat, 17 Sep 2011)
@@ -12,6 +12,7 @@
#include <boost/geometry/extensions/index/algorithms/mindist.hpp>
#include <boost/geometry/extensions/index/algorithms/minmaxdist.hpp>
+#include <boost/geometry/extensions/index/algorithms/maxdist.hpp>
#include <boost/geometry/extensions/index/rtree/node/node.hpp>
@@ -19,6 +20,10 @@
namespace detail { namespace rtree { namespace visitors {
+// TODO: awulkiew - maby it's a good idea to check if curr_mindist < comp_mindist and then check predicates
+// in store() or break store to 2 functions e.g. should_store() and store()
+// - well not with this algorithm of storing k-th neighbor
+
template <typename Value, typename Translator, typename Point>
struct nearest_one
{
@@ -85,6 +90,7 @@
// TODO: awulkiew - test other methods:
// heap, manual inserting
// don't sort if size < k ?
+ // check the furthest distance at the first place, before push_back()
}
inline bool is_mindist_valid() const