Changeset 1080

Timestamp:

Feb 13, 2008, 12:49:57 PM (16 years ago)

Author:

Peter

Message:

refs #247, #252, and #267

Location:

trunk/yat

Files:

• classifier/DataLookup1D.cc (modified) (2 diffs)
• classifier/DataLookup1D.h (modified) (2 diffs)
• classifier/KernelLookup.h (modified) (2 diffs)
• classifier/MatrixLookup.h (modified) (2 diffs)
• utility/Iterator.h (modified) (6 diffs)
• utility/IteratorPolicy.h (added)

trunk/yat/classifier/DataLookup1D.cc

@@ -95 +95 @@
   DataLookup1D::const_iterator DataLookup1D::begin(void) const
   {
-    typedef utility::Iterator<const DataLookup2D, const double> Iter;
     if (column_vector_)
-      return const_iterator(Iter(*matrix_, 0, index_), matrix_->columns());
-    return const_iterator(Iter(*matrix_, index_, 0), 1);
+      return const_iterator(const_iterator::iterator_type(*matrix_, 0, index_), 
+                            matrix_->columns());
+    return const_iterator(const_iterator::iterator_type(*matrix_, index_, 0),1);
   }
 
@@ -104 +104 @@
   DataLookup1D::const_iterator DataLookup1D::end(void) const
   {
-    typedef utility::Iterator<const DataLookup2D, const double> Iter;
     if (column_vector_)
-      return const_iterator(Iter(*matrix_, matrix_->rows(), index_), 
+      return const_iterator(const_iterator::iterator_type(*matrix_,
+                                                          matrix_->rows(), 
+                                                          index_), 
                             matrix_->columns());
-    return const_iterator(Iter(*matrix_, index_+1, 0), 1);
+    return const_iterator(const_iterator::iterator_type(*matrix_,index_+1,0), 1);
   }
 

trunk/yat/classifier/DataLookup1D.h

@@ -29 +29 @@
 #include "DataLookup2D.h"
 #include "yat/utility/Iterator.h"
+#include "yat/utility/iterator_traits.h"
 #include "yat/utility/StrideIterator.h"
 
@@ -49 +50 @@
   public:
     /// 'Read Only' iterator
-    typedef utility::StrideIterator<utility::Iterator<const DataLookup2D, 
-                                                      const double> >
+    typedef utility::StrideIterator<
+    utility::Iterator<const DataLookup2D, utility::unweighted_type, const double,
+                      void, const double> >
     const_iterator;
 

trunk/yat/classifier/KernelLookup.h

@@ -31 +31 @@
 #include "MatrixLookup.h"
 #include "yat/utility/Iterator.h"
+#include "yat/utility/iterator_traits.h"
 #include "yat/utility/StrideIterator.h"
 
@@ -70 +71 @@
   public:
     /// 'Read Only' iterator
-    typedef utility::StrideIterator<utility::Iterator<const KernelLookup, 
-                                                      const double> > 
+    typedef utility::StrideIterator<
+    utility::Iterator<const KernelLookup, utility::unweighted_type, const double,
+                      void, const double> >
     const_iterator;
 

trunk/yat/classifier/MatrixLookup.h

@@ -29 +29 @@
 #include "DataLookup2D.h"
 #include "yat/utility/Iterator.h"
+#include "yat/utility/iterator_traits.h"
 #include "yat/utility/StrideIterator.h"
 
@@ -73 +74 @@
   public:
     /// 'Read Only' iterator
-    typedef utility::StrideIterator<utility::Iterator<const MatrixLookup, 
-                                                      const double> > 
+    typedef utility::StrideIterator<
+    utility::Iterator<const MatrixLookup, utility::unweighted_type, const double,
+                      void, const double> >
     const_iterator;
 

trunk/yat/utility/Iterator.h

@@ -25 +25 @@
 */
 
+#include "IteratorPolicy.h"
 #include "yat_assert.h"
 
@@ -39 +40 @@
      @brief Iterator
   */
-  template<typename Container, typename T> 
+  template<typename Container, typename weighted_tag, typename value, 
+           typename pointer = value*, typename reference = value&,
+           class Policy = IteratorPolicy<Container, reference> > 
   class Iterator
-    : public std::iterator<std::random_access_iterator_tag, double, size_t, T, 
-                           void>
+    : public std::iterator<std::random_access_iterator_tag, value, size_t, 
+                           pointer, reference>
   {
   public:
-    //typedef size_t difference_type;
-    typedef T reference;
-    typedef double* pointer;
-    
+    typedef weighted_tag weighted_iterator_type;
+
   private:
-    typedef Iterator<Container, T> self;
+    typedef Iterator<Container, weighted_tag, value, pointer, reference> self;
 
   public:
@@ -75 +76 @@
       yat_assert<std::out_of_range>(index_ < this->size(), 
                                     "Iterator::operator*");
-      return container_->operator()(this->row(index_), this->column(index_));
+      return ip_.dereference(*container_, row(index_), column(index_));
     }
 
@@ -85 +86 @@
       yat_assert<std::out_of_range>(index_+n < this->size(),
                                     "Iterator::operator[]");
-      return container_->operator()(this->row(index_+n), this->column(index_+n));
+      return ip_.dereference(*container_, row(index_+n), column(index_+n));
     }
 
@@ -228 +229 @@
     Container* container_;
     size_t index_;
+    Policy ip_;
 
     size_t column(size_t i) const 
@@ -236 +238 @@
     { return container_->columns()*container_->rows(); }
 
+
     // Using compiler generated copy
     //Iterator(const Iterator&);