[Boost-commit] svn:boost r56399 - sandbox/statistics/matrix_view/boost/matrix_view/iterator

Subject: [Boost-commit] svn:boost r56399 - sandbox/statistics/matrix_view/boost/matrix_view/iterator
From: erwann.rogard_at_[hidden]
Date: 2009-09-26 20:04:44

Author: e_r
Date: 2009-09-26 20:04:43 EDT (Sat, 26 Sep 2009)
New Revision: 56399
URL: http://svn.boost.org/trac/boost/changeset/56399

Log:
m
Text files modified: 
   sandbox/statistics/matrix_view/boost/matrix_view/iterator/row_iterator.hpp |    80 ++++++++++++++++++++++++----------------
   1 files changed, 48 insertions(+), 32 deletions(-)

Modified: sandbox/statistics/matrix_view/boost/matrix_view/iterator/row_iterator.hpp
==============================================================================
--- sandbox/statistics/matrix_view/boost/matrix_view/iterator/row_iterator.hpp	(original)
+++ sandbox/statistics/matrix_view/boost/matrix_view/iterator/row_iterator.hpp	2009-09-26 20:04:43 EDT (Sat, 26 Sep 2009)
@@ -1,13 +1,13 @@
 ///////////////////////////////////////////////////////////////////////////////
-// matrix_view::iterator::row_iterator.hpp                                   //
+// view::iterator::row_iterator.hpp                                   //
 //                                                                           //
 //  (C) Copyright 2009 Erwann Rogard                                         //
 //  Use, modification and distribution are subject to the                    //
 //  Boost Software License, Version 1.0. (See accompanying file              //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)         //
 ///////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_MATRIX_VIEW_ITERATOR_ROW_ITERATOR_HPP_ER_2009
-#define BOOST_MATRIX_VIEW_ITERATOR_ROW_ITERATOR_HPP_ER_2009
+#ifndef BOOST_VIEW_ITERATOR_ROW_ITERATOR_HPP_ER_2009
+#define BOOST_VIEW_ITERATOR_ROW_ITERATOR_HPP_ER_2009
 #include <iterator>
 #include <algorithm>
 #include <cmath>
@@ -17,50 +17,66 @@
 #include <boost/range.hpp>
 
 namespace boost{
-namespace matrix_view{
+namespace view{
 
+// Should be rename rows_iterator
 // Maps a pair of iterators and a stride to an iterator that iterates over
 // ranges. In matrix terminology,  ++row_iterator moves down one row.
 template<
-    typename BaseIter,
-    typename Categ = typename iterator_category<BaseIter>::type,
-    typename Diff = typename iterator_difference<BaseIter>::type>
+    typename It,
+    typename Categ = typename iterator_category<It>::type,
+    typename Diff = typename iterator_difference<It>::type
+>
 class row_iterator
-  : public iterator_facade<
-        row_iterator<BaseIter>
-      , iterator_range<BaseIter>
+  : public iterator_adaptor<
+        row_iterator<It>
+      , iterator_range<It>
       , Categ
-      , iterator_range<BaseIter>
+      , iterator_range<It>
       , Diff
     >
 {
+    typedef iterator_facade<
+        row_iterator<It>
+      , iterator_range<It>
+      , Categ
+      , iterator_range<It>
+      , Diff
+    > super_;
+
  public:
-    row_iterator(){}
+    row_iterator() : super_(){}
 
-    explicit row_iterator(BaseIter i,std::size_t stride)
-    :stride_(stride),base_iter(i){}
+    explicit row_iterator(It i,std::size_t stride)
+    :super_(),stride_(stride),base_iter(i){}
+    
     row_iterator(const row_iterator& that)
-    :stride_(that.stride_),base_iter(that.base_iter){}
+    :super_(that),stride_(that.stride_),base_iter(that.base_iter){}
+    
+    // TODO probably not needed
     row_iterator& operator=(const row_iterator& that){
         if(&that!=this){
+            super_::operator=(that);
             stride_ = that.stride_;
             base_iter = that.base_iter;
         }
         return *this;
     }
 
-    BaseIter base(){return base_iter;}
-    std::size_t stride()const{return stride_;}
+    It base(){ return base_iter; }
+    std::size_t stride()const{ return stride_; }
  private:
-    typedef iterator_range<BaseIter> Value;
+    typedef iterator_range<It> Value;
 
     friend class iterator_core_access;
 
-    void increment() { std::advance(this->base_iter,stride_); }
+    void increment() { 
+        std::advance(this->base_iter,stride_); 
+    }
 
     Diff distance_to(row_iterator const& other) const{
         Diff d = std::distance(this->base_iter,other.base_iter);
-        d/=(Diff)(stride());
+        d /= static_cast<Diff>(this->stride());
         return d;
     };
 
@@ -71,7 +87,7 @@
 
     Value dereference() const {
         //Value& inappropriate as result is local
-        BaseIter i = this->base_iter;
+        It i = this->base_iter;
         std::advance(i,stride_);
         return make_iterator_range(this->base_iter,i);
     }
@@ -82,15 +98,15 @@
     }
 
     std::size_t stride_;
-    BaseIter base_iter;
+    It base_iter;
 };
 
-template<typename BaseIter>
-row_iterator<BaseIter>
-make_end_row_iterator(BaseIter b,BaseIter e,std::size_t stride){
+template<typename It>
+row_iterator<It>
+make_end_row_iterator(It b,It e,std::size_t stride){
     //BOOST_ASSERT(std::distance(b,e)>0);
     BOOST_ASSERT( ( std::distance(b,e)>0 ) || ( std::distance(b,e)==0 ) );
-    BaseIter ee = e;
+    It ee = e;
     //std::size_t d = (std::size_t)(std::distance(b,ee)-1)/stride;
 
     std::size_t d = (std::size_t)(std::distance(b,ee))/stride;
@@ -98,16 +114,16 @@
     //ee = b; std::advance(ee,d+1);
     ee = b; std::advance(ee,d);
 
-   return row_iterator<BaseIter>(ee,stride);
+   return row_iterator<It>(ee,stride);
 }
 
-template<typename BaseIter>
-row_iterator<BaseIter>
-make_row_iterator(BaseIter b,std::size_t stride){
-   return row_iterator<BaseIter>(b,stride);
+template<typename It>
+row_iterator<It>
+make_row_iterator(It b,std::size_t stride){
+   return row_iterator<It>(b,stride);
 }
 
-}// matrix_view
+}// view
 }// boost
 
 #endif