[Boost-commit] svn:boost r85495 - in trunk/boost/geometry/index: . detail/rtree

Subject: [Boost-commit] svn:boost r85495 - in trunk/boost/geometry/index: . detail/rtree
From: adam.wulkiewicz_at_[hidden]
Date: 2013-08-27 20:51:15

Author: awulkiew
Date: 2013-08-27 20:51:14 EDT (Tue, 27 Aug 2013)
New Revision: 85495
URL: http://svn.boost.org/trac/boost/changeset/85495

Log:
[geometry][index] implemented alternative version of type-erased query iterators (still experimental).

Text files modified: 
   trunk/boost/geometry/index/detail/rtree/query_iterators.hpp |   169 ++++++++++++++++++++++++++++++++------- 
   trunk/boost/geometry/index/rtree.hpp                        |     2                                         
   2 files changed, 139 insertions(+), 32 deletions(-)

Modified: trunk/boost/geometry/index/detail/rtree/query_iterators.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/query_iterators.hpp	Tue Aug 27 18:37:15 2013	(r85494)
+++ trunk/boost/geometry/index/detail/rtree/query_iterators.hpp	2013-08-27 20:51:14 EDT (Tue, 27 Aug 2013)	(r85495)
@@ -11,6 +11,8 @@
 #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUERY_ITERATORS_HPP
 #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUERY_ITERATORS_HPP
 
+#include <boost/scoped_ptr.hpp>
+
 namespace boost { namespace geometry { namespace index {
 
 namespace detail { namespace rtree {
@@ -50,15 +52,10 @@
         return *this;
     }
 
-    friend bool operator==(end_query_iterator l, end_query_iterator r)
+    friend bool operator==(end_query_iterator const& /*l*/, end_query_iterator const& /*r*/)
     {
         return true;
     }
-
-    friend bool operator!=(end_query_iterator l, end_query_iterator r)
-    {
-        return false;
-    }
 };
 
 template <typename Value, typename Options, typename Translator, typename Box, typename Allocators, typename Predicates>
@@ -112,30 +109,15 @@
         return l.m_visitor == r.m_visitor;
     }
 
-    friend bool operator==(spatial_query_iterator const& l, end_query_iterator<Value, Allocators>)
+    friend bool operator==(spatial_query_iterator const& l, end_query_iterator<Value, Allocators> const& /*r*/)
     {
         return l.m_visitor.is_end();
     }
 
-    friend bool operator==(end_query_iterator<Value, Allocators>, spatial_query_iterator const& r)
+    friend bool operator==(end_query_iterator<Value, Allocators> const& /*l*/, spatial_query_iterator const& r)
     {
         return r.m_visitor.is_end();
     }
-
-    friend bool operator!=(spatial_query_iterator const& l, spatial_query_iterator const& r)
-    {
-        return !(l.m_visitor == r.m_visitor);
-    }
-
-    friend bool operator!=(spatial_query_iterator const& l, end_query_iterator<Value, Allocators>)
-    {
-        return !l.m_visitor.is_end();
-    }
-
-    friend bool operator!=(end_query_iterator<Value, Allocators>, spatial_query_iterator const& r)
-    {
-        return !r.m_visitor.is_end();
-    }
     
 private:
     visitor_type m_visitor;
@@ -192,33 +174,156 @@
         return l.m_visitor == r.m_visitor;
     }
 
-    friend bool operator==(distance_query_iterator const& l, end_query_iterator<Value, Allocators>)
+    friend bool operator==(distance_query_iterator const& l, end_query_iterator<Value, Allocators> const& /*r*/)
     {
         return l.m_visitor.is_end();
     }
 
-    friend bool operator==(end_query_iterator<Value, Allocators>, distance_query_iterator const& r)
+    friend bool operator==(end_query_iterator<Value, Allocators> const& /*l*/, distance_query_iterator const& r)
     {
         return r.m_visitor.is_end();
     }
 
-    friend bool operator!=(distance_query_iterator const& l, distance_query_iterator const& r)
+private:
+    visitor_type m_visitor;
+};
+
+template <typename L, typename R>
+inline bool operator!=(L const& l, R const& r)
+{
+    return !(l == r);
+}
+
+// type-erased iterators
+
+template <typename Value, typename Allocators>
+class query_iterator_base
+{
+public:
+    typedef std::input_iterator_tag iterator_category;
+    typedef Value value_type;
+    typedef typename Allocators::const_reference reference;
+    typedef typename Allocators::difference_type difference_type;
+    typedef typename Allocators::const_pointer pointer;
+
+    virtual ~query_iterator_base() {}
+
+    virtual query_iterator_base * clone() const = 0;
+    
+    virtual bool is_end() const = 0;
+    virtual reference dereference() const = 0;
+    virtual void increment() = 0;
+    virtual bool equals(query_iterator_base const&) const = 0;
+};
+
+template <typename Value, typename Allocators, typename Iterator>
+class query_iterator_wrapper
+    : public query_iterator_base<Value, Allocators>
+{
+    typedef query_iterator_base<Value, Allocators> base_t;
+
+public:
+    typedef std::input_iterator_tag iterator_category;
+    typedef Value value_type;
+    typedef typename Allocators::const_reference reference;
+    typedef typename Allocators::difference_type difference_type;
+    typedef typename Allocators::const_pointer pointer;
+
+    explicit query_iterator_wrapper(Iterator const& it) : m_iterator(it) {}
+
+    virtual base_t * clone() const { return new query_iterator_wrapper(m_iterator); }
+
+    virtual bool is_end() const { return m_iterator == end_query_iterator<Value, Allocators>(); }
+    virtual reference dereference() const { return *m_iterator; }
+    virtual void increment() { ++m_iterator; }
+    virtual bool equals(query_iterator_base const& r) const
+    {
+        const query_iterator_wrapper * p = dynamic_cast<const query_iterator_wrapper *>(boost::addressof(r));
+        BOOST_ASSERT_MSG(p, "those iterators can't be compared");
+        return m_iterator == p->m_iterator;
+    }
+
+private:
+    Iterator m_iterator;
+};
+
+template <typename Value, typename Allocators>
+class query_iterator
+{
+    typedef query_iterator_base<Value, Allocators> iterator_base;
+    typedef boost::scoped_ptr<iterator_base> iterator_ptr;
+
+public:
+    typedef std::input_iterator_tag iterator_category;
+    typedef Value value_type;
+    typedef typename Allocators::const_reference reference;
+    typedef typename Allocators::difference_type difference_type;
+    typedef typename Allocators::const_pointer pointer;
+
+    query_iterator() {}
+
+    template <typename It>
+    query_iterator(It const& it)
+        : m_ptr(static_cast<iterator_base*>(
+                    new query_iterator_wrapper<Value, Allocators, It>(it) ))
+    {}
+
+    query_iterator(end_query_iterator<Value, Allocators> const& /*it*/)
+    {}
+
+    query_iterator(query_iterator const& o)
+        : m_ptr(o.m_ptr.get() ? o.m_ptr->clone() : 0)
+    {}
+
+    query_iterator & operator=(query_iterator const& o)
+    {
+        m_ptr.reset(o.m_ptr.get() ? o.m_ptr->clone() : 0);
+        return *this;
+    }
+
+    reference operator*() const
+    {
+        return m_ptr->dereference();
+    }
+
+    const value_type * operator->() const
+    {
+        return boost::addressof(m_ptr->dereference());
+    }
+
+    query_iterator & operator++()
     {
-        return !(l.m_visitor == r.m_visitor);
+        m_ptr->increment();
+        return *this;
     }
 
-    friend bool operator!=(distance_query_iterator const& l, end_query_iterator<Value, Allocators>)
+    query_iterator operator++(int)
     {
-        return !l.m_visitor.is_end();
+        distance_query_iterator temp = *this;
+        this->operator++();
+        return temp;
     }
 
-    friend bool operator!=(end_query_iterator<Value, Allocators>, distance_query_iterator const& r)
+    friend bool operator==(query_iterator const& l, query_iterator const& r)
     {
-        return !r.m_visitor.is_end();
+        if ( l.m_ptr.get() )
+        {
+            if ( r.m_ptr.get() )
+                return l.m_ptr->equals(*r.m_ptr);
+            else
+                return l.m_ptr->is_end();
+        }
+        else
+        {
+            if ( r.m_ptr.get() )
+                return r.m_ptr->is_end();
+            else
+                return true;
+        }
     }
 
 private:
-    visitor_type m_visitor;
+    iterator_ptr m_ptr;
 };
 
 }} // namespace detail::rtree

Modified: trunk/boost/geometry/index/rtree.hpp
==============================================================================
--- trunk/boost/geometry/index/rtree.hpp	Tue Aug 27 18:37:15 2013	(r85494)
+++ trunk/boost/geometry/index/rtree.hpp	2013-08-27 20:51:14 EDT (Tue, 27 Aug 2013)	(r85495)
@@ -771,6 +771,8 @@
         value_type, const_reference, const_pointer, difference_type
     >::type const_query_iterator;
 
+    typedef index::detail::rtree::query_iterator<value_type, allocators_type> const_query_iterator_alt;
+
 #endif // BOOST_GEOMETRY_INDEX_DETAIL_ENABLE_TYPE_ERASED_ITERATORS
 
     template <typename Predicates>