Changeset 1067

Timestamp:

Feb 11, 2008, 12:09:04 AM (16 years ago)

Author:

Peter

Message:

using std::iterator in Iterator

File:

• trunk/yat/utility/Iterator.h (modified) (7 diffs)

trunk/yat/utility/Iterator.h

@@ -41 +41 @@
   template<typename Container, typename T> 
   class Iterator
+    : public std::iterator<std::random_access_iterator_tag, double, size_t, T, 
+                           void>
   {
   public:
-    typedef std::random_access_iterator_tag iterator_category;
-    typedef double value_type;
-    typedef size_t difference_type;
+    //typedef size_t difference_type;
     typedef T reference;
     typedef double* pointer;
@@ -65 +65 @@
        \param colun telling which column iterator points to
     */
-    Iterator(Container& container, difference_type row, difference_type column)
+    Iterator(Container& container, size_t row, size_t column)
       : container_(&container), index_(row*container.columns()+column) {}
 
@@ -81 +81 @@
        \return element \a n steps forward
      */
-    reference operator[](difference_type n) const 
+    reference operator[](size_t n) const 
     { 
       yat_assert<std::out_of_range>(index_+n < this->size(),
@@ -137 +137 @@
        \return copy of resulting iterator
      */
-    friend Iterator operator+(const Iterator& lhs, difference_type n) 
+    friend Iterator operator+(const Iterator& lhs, size_t n) 
     { return self(*lhs.container_, lhs.index_+n); }
 
@@ -145 +145 @@
        \return copy of resulting iterator
      */
-    friend Iterator operator-(const Iterator& lhs, difference_type n) 
+    friend Iterator operator-(const Iterator& lhs, size_t n) 
     { return self(*lhs.container_, lhs.index_-n); }
 
@@ -153 +153 @@
        \return distance between \a lhs and \a rhs
      */
-    friend difference_type operator-(const Iterator& lhs, const Iterator& rhs) 
+    friend size_t operator-(const Iterator& lhs, const Iterator& rhs) 
     { 
       yat_assert<std::runtime_error>(lhs.container_==rhs.container_, 
@@ -227 +227 @@
   private:
     Container* container_;
-    difference_type index_;
-
-    difference_type column(difference_type i) const 
+    size_t index_;
+
+    size_t column(size_t i) const 
     { return i % container_->columns(); }
-    difference_type row(difference_type i) const 
-    { return static_cast<difference_type>(i/container_->columns()); }
-    difference_type size() const 
+    size_t row(size_t i) const 
+    { return static_cast<size_t>(i/container_->columns()); }
+    size_t size() const 
     { return container_->columns()*container_->rows(); }