Changeset 1528

Timestamp:

Sep 24, 2008, 5:46:28 PM (15 years ago)

Author:

Peter

Message:

refs #444 - started using boost::permutation_iterator for vector iterators from MatrixLookup? and also removed stride layer for const_iterator (stride was always 1).

Location:

trunk/yat

Files:

• classifier/MatrixLookup.cc (modified) (6 diffs)
• classifier/MatrixLookup.h (modified) (4 diffs)
• utility/Index.cc (modified) (1 diff)
• utility/Index.h (modified) (2 diffs)

trunk/yat/classifier/MatrixLookup.cc

@@ -150 +150 @@
   MatrixLookup::const_iterator MatrixLookup::begin(void) const
   {
-    return const_iterator(const_iterator::iterator_type(*this, 0, 0), 1);
+    return const_iterator(*this, 0, 0);
   }
 
@@ -156 +156 @@
   MatrixLookup::const_column_iterator MatrixLookup::begin_column(size_t i) const
   {
-    return const_column_iterator(const_column_iterator::iterator_type(*this, 0,
-                                                                      i),
-                                 columns());
+    return const_column_iterator(data_->begin_column(column_index_[i]), 
+                                 row_index_.begin());
   }
 
@@ -164 +163 @@
   MatrixLookup::const_row_iterator MatrixLookup::begin_row(size_t i) const
   {
-    return const_row_iterator(const_row_iterator::iterator_type(*this,i,0), 1);
+    return const_row_iterator(data_->begin_row(row_index_[i]), 
+                              column_index_.begin());
   }
 
@@ -176 +176 @@
   MatrixLookup::const_iterator MatrixLookup::end(void) const
   {
-    return const_iterator(const_iterator::iterator_type(*this, rows(), 0), 1);
+    return const_iterator(*this, rows(), 0);
   }
 
@@ -182 +182 @@
   MatrixLookup::const_column_iterator MatrixLookup::end_column(size_t i) const
   {
-    return 
-      const_column_iterator(const_column_iterator::iterator_type(*this,rows(),
-                                                                      i), 
-                            columns());
+    return const_column_iterator(data_->end_column(column_index_[i]), 
+                                 row_index_.end());
   }
 
@@ -191 +189 @@
   MatrixLookup::const_row_iterator MatrixLookup::end_row(size_t i) const
   {
-    return const_row_iterator(const_row_iterator::iterator_type(*this,i+1,0),1);
+    return const_row_iterator(data_->end_row(row_index_[i]), 
+                                 column_index_.end());
   }
 

trunk/yat/classifier/MatrixLookup.h

@@ -29 +29 @@
 #include "yat/utility/Index.h"
 #include "yat/utility/iterator_traits.h"
+#include "yat/utility/Matrix.h"
 #include "yat/utility/SmartPtr.h"
-#include "yat/utility/StrideIterator.h"
+
+#include <boost/iterator/permutation_iterator.hpp>
 
 #include <iostream>
@@ -37 +39 @@
 namespace theplu {
 namespace yat {
-
-namespace utility {
-  class Matrix;
-}
-
 namespace classifier {  
 
@@ -76 +73 @@
   public:
     /// 'Read Only' iterator
-    typedef utility::StrideIterator<
-    utility::Container2DIterator<const MatrixLookup, const double, void, 
-                                 const double> >
+    typedef utility::Container2DIterator<const MatrixLookup, const double, 
+                                         void, const double>
     const_iterator;
 
@@ -84 +80 @@
        'Read only' iterator used to iterate over a column
      */
-    typedef const_iterator const_column_iterator;
+    typedef boost::permutation_iterator<utility::Matrix::const_column_iterator,
+                                        utility::Index::const_iterator> 
+    const_column_iterator;
 
     /**
        'Read only' iterator used to iterate over a row
      */
-    typedef const_iterator const_row_iterator;
+    typedef const_column_iterator const_row_iterator;
 
     ///

trunk/yat/utility/Index.cc

@@ -65 +65 @@
 
 
+  Index::const_iterator Index::begin(void) const
+  {
+    return index_->begin();
+  }
+
+
+  Index::const_iterator Index::end(void) const
+  {
+    return index_->end();
+  }
+
+
   size_t Index::size(void) const
   {

trunk/yat/utility/Index.h

@@ -40 +40 @@
   public:
     /**
+       Read only iterator
+
+       \since New in yat 0.5
+     */
+    typedef std::vector<size_t>::const_iterator const_iterator;
+
+    /**
        Creates an empty Index
      */
@@ -68 +75 @@
 
     /**
+       \return iterator pointing to first element of Index
+
+       \since New in yat 0.5
+     */
+    const_iterator begin(void) const;
+
+    /**
+       \return iterator pointing to element one passed last Index
+
+       \since New in yat 0.5
+     */
+    const_iterator end(void) const;
+
+    /**
        \brief access operator
     */