Changeset 1066 for trunk/yat/classifier

Timestamp:

Feb 10, 2008, 11:48:19 PM (13 years ago)

Author:

Peter

Message:

Iterators for KernelLookup? - refs #267

Location:

trunk/yat/classifier

Files:

• KernelLookup.cc (modified) (2 diffs)
• KernelLookup.h (modified) (5 diffs)
• MatrixLookup.cc (modified) (6 diffs)
• MatrixLookup.h (modified) (2 diffs)

trunk/yat/classifier/KernelLookup.cc

@@ -117 +117 @@
 
 
+  KernelLookup::const_iterator KernelLookup::begin(void) const
+  {
+    return const_iterator(const_iterator::iterator_type(*this, 0, 0), 1);
+  }
+
+
+  KernelLookup::const_iterator KernelLookup::begin_column(size_t i) const
+  {
+    return const_iterator(const_iterator::iterator_type(*this, 0, i), columns());
+  }
+
+
+  KernelLookup::const_iterator KernelLookup::begin_row(size_t i) const
+  {
+    return const_iterator(const_iterator::iterator_type(*this, i, 0), 1);
+  }
+
+
   const DataLookup2D* KernelLookup::data(void) const
   {
@@ -132 +150 @@
   {
     return kernel_->element(vec, row_index_[i]);
+  }
+
+
+  KernelLookup::const_iterator KernelLookup::end(void) const
+  {
+    return const_iterator(const_iterator::iterator_type(*this, rows(), 0), 1);
+  }
+
+
+  KernelLookup::const_iterator KernelLookup::end_column(size_t i) const
+  {
+    return const_iterator(const_iterator::iterator_type(*this, this->rows(), i),
+                          this->columns());
+  }
+
+
+  KernelLookup::const_iterator KernelLookup::end_row(size_t i) const
+  {
+    return const_iterator(const_iterator::iterator_type(*this, i+1, 0), 1);
   }
 

trunk/yat/classifier/KernelLookup.h

@@ -7 +7 @@
   Copyright (C) 2005 Jari Häkkinen, Peter Johansson
   Copyright (C) 2006 Jari Häkkinen, Markus Ringnér, Peter Johansson
-  Copyright (C) 2007 Peter Johansson
+  Copyright (C) 2007, 2008 Peter Johansson
 
   This file is part of the yat library, http://trac.thep.lu.se/yat
@@ -30 +30 @@
 #include "DataLookup2D.h"
 #include "MatrixLookup.h"
+#include "yat/utility/Iterator.h"
+#include "yat/utility/StrideIterator.h"
+
 
 #include <vector>
@@ -66 +69 @@
 
   public:
+    /// 'Read Only' iterator
+    typedef utility::StrideIterator<utility::Iterator<const KernelLookup, 
+                                                      const double> > 
+    const_iterator;
 
     ///
@@ -158 +165 @@
     virtual ~KernelLookup(void);
 
+    /**
+       Iterator iterates along a row. When end of row is reached it
+       jumps to beginning of next row.
+
+       \return const_iterator pointing to upper-left element.
+     */
+    const_iterator begin(void) const;
+
+    /**
+       Iterator iterates along a column.
+
+       \return iterator pointing to first element of column \a i.
+     */
+    const_iterator begin_column(size_t) const;
+
+    /**
+       Iterator iterates along a column.
+
+       \return const_iterator pointing to first element of column \a i.
+     */
+    const_iterator begin_row(size_t) const;
+
     ///
     /// Each column in returned DataLookup corresponds to the column
@@ -187 +216 @@
     */
     double element(const DataLookupWeighted1D& vec, size_t i) const;
+
+    /**
+       \return const_iterator pointing to end of matrix
+     */
+    const_iterator end(void) const;
+
+    /**
+       \return const_iterator pointing to end of column \a i
+     */
+    const_iterator end_column(size_t) const;
+
+    /**
+       \return const_iterator pointing to end of row \a i
+     */
+    const_iterator end_row(size_t) const;
 
     /**

trunk/yat/classifier/MatrixLookup.cc

@@ -163 +163 @@
   MatrixLookup::const_iterator MatrixLookup::begin(void) const
   {
-    return const_iterator(normal_iter(*this, 0, 0), 1);
+    return const_iterator(const_iterator::iterator_type(*this, 0, 0), 1);
   }
 
@@ -169 +169 @@
   MatrixLookup::const_iterator MatrixLookup::begin_column(size_t i) const
   {
-    return const_iterator(normal_iter(*this, 0, i),this->columns());
+    return const_iterator(const_iterator::iterator_type(*this, 0, i),columns());
   }
 
@@ -175 +175 @@
   MatrixLookup::const_iterator MatrixLookup::begin_row(size_t i) const
   {
-    return const_iterator(normal_iter(*this, i, 0), 1);
+    return const_iterator(const_iterator::iterator_type(*this, i, 0), 1);
   }
 
@@ -181 +181 @@
   MatrixLookup::const_iterator MatrixLookup::end(void) const
   {
-    return const_iterator(normal_iter(*this, this->rows(), 0), 1);
+    return const_iterator(const_iterator::iterator_type(*this, rows(), 0), 1);
   }
 
@@ -187 +187 @@
   MatrixLookup::const_iterator MatrixLookup::end_column(size_t i) const
   {
-    return const_iterator(normal_iter(*this, this->rows(), i), this->columns());
+    return const_iterator(const_iterator::iterator_type(*this, rows(), i), 
+                          columns());
   }
 
@@ -193 +194 @@
   MatrixLookup::const_iterator MatrixLookup::end_row(size_t i) const
   {
-    return const_iterator(normal_iter(*this, i+1, 0), 1);
+    return const_iterator(const_iterator::iterator_type(*this, i+1, 0), 1);
   }
 

trunk/yat/classifier/MatrixLookup.h

@@ -221 +221 @@
 
     /**
+       Iterator iterates along a row. When end of row is reached it
+       jumps to beginning of next row.
+
+       \return const_iterator pointing to upper-left element.
      */
     const_iterator begin(void) const;
 
     /**
+       Iterator iterates along a column.
+
+       \return iterator pointing to first element of column \a i.
      */
     const_iterator begin_column(size_t) const;
 
     /**
+       Iterator iterates along a column.
+
+       \return const_iterator pointing to first element of column \a i.
      */
     const_iterator begin_row(size_t) const;
 
     /**
+       \return const_iterator pointing to end of matrix
      */
     const_iterator end(void) const;
 
     /**
+       \return const_iterator pointing to end of column \a i
      */
     const_iterator end_column(size_t) const;
 
     /**
+       \return const_iterator pointing to end of row \a i
      */
     const_iterator end_row(size_t) const;
@@ -310 +323 @@
     
   private:
-    typedef utility::Iterator<const MatrixLookup, const double> normal_iter;
     friend class MatrixLookupWeighted;