Changeset 1063

Timestamp:

Feb 10, 2008, 10:33:39 PM (16 years ago)

Author:

Peter

Message:

Iterators for MatrixLookup?

Location:

trunk/yat/classifier

Files:

• MatrixLookup.cc (modified) (1 diff)
• MatrixLookup.h (modified) (4 diffs)

trunk/yat/classifier/MatrixLookup.cc

@@ -161 +161 @@
 
 
+  MatrixLookup::const_iterator MatrixLookup::begin(void) const
+  {
+    return const_iterator(normal_iter(*this, 0, 0), 1);
+  }
+
+
+  MatrixLookup::const_iterator MatrixLookup::begin_column(size_t i) const
+  {
+    return const_iterator(normal_iter(*this, 0, i),this->columns());
+  }
+
+
+  MatrixLookup::const_iterator MatrixLookup::begin_row(size_t i) const
+  {
+    return const_iterator(normal_iter(*this, i, 0), 1);
+  }
+
+
+  MatrixLookup::const_iterator MatrixLookup::end(void) const
+  {
+    return const_iterator(normal_iter(*this, this->rows(), 0), 1);
+  }
+
+
+  MatrixLookup::const_iterator MatrixLookup::end_column(size_t i) const
+  {
+    return const_iterator(normal_iter(*this, this->rows(), i), this->columns());
+  }
+
+
+  MatrixLookup::const_iterator MatrixLookup::end_row(size_t i) const
+  {
+    return const_iterator(normal_iter(*this, i+1, 0), 1);
+  }
+
+
   const MatrixLookup* 
   MatrixLookup::selected(const std::vector<size_t>& i) const

trunk/yat/classifier/MatrixLookup.h

@@ -29 +29 @@
 #include "DataLookup2D.h"
 #include "yat/utility/Iterator.h"
+#include "yat/utility/StrideIterator.h"
 
 #include <iostream>
@@ -70 +71 @@
   class MatrixLookup : public DataLookup2D
   {
-    typedef utility::Iterator<const MatrixLookup, const double&> const_iterator;
-
-  public:
+  public:
+    /// 'Read Only' iterator
+    typedef utility::StrideIterator<utility::Iterator<const MatrixLookup, 
+                                                      const double> > 
+    const_iterator;
+
     ///
     /// Constructor creating a lookup into the entire @a matrix. 
@@ -219 +223 @@
      */
     const_iterator begin(void) const;
+
+    /**
+     */
+    const_iterator begin_column(size_t) const;
+
+    /**
+     */
     const_iterator begin_row(size_t) const;
-    const_iterator begin_column(size_t) const;
+
+    /**
+     */
+    const_iterator end(void) const;
+
+    /**
+     */
+    const_iterator end_column(size_t) const;
+
+    /**
+     */
+    const_iterator end_row(size_t) const;
 
     /**
@@ -288 +310 @@
     
   private:
+    typedef utility::Iterator<const MatrixLookup, const double> normal_iter;
     friend class MatrixLookupWeighted;