Changeset 1528 for trunk/yat/classifier/MatrixLookup.h

Timestamp:

Sep 24, 2008, 5:46:28 PM (14 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).

File:

• trunk/yat/classifier/MatrixLookup.h (modified) (4 diffs)

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;
 
     ///