Changeset 1589 for trunk/yat/classifier/MatrixLookupWeighted.h

Timestamp:

Oct 17, 2008, 6:10:43 PM (15 years ago)

Author:

Peter

Message:

fixes #444

File:

• trunk/yat/classifier/MatrixLookupWeighted.h (modified) (3 diffs)

trunk/yat/classifier/MatrixLookupWeighted.h

@@ -28 +28 @@
 #include "yat/utility/DataWeight.h"
 #include "yat/utility/Index.h"
+#include "yat/utility/MatrixWeighted.h"
 #include "yat/utility/SmartPtr.h"
 #include "yat/utility/StrideIterator.h"
+
+#include <boost/iterator/permutation_iterator.hpp>
 
 #include <iostream>
@@ -37 +40 @@
 namespace theplu {
 namespace yat {
-
-namespace utility {
-  class MatrixWeighted;
-}
-
 namespace classifier {  
 
@@ -88 +86 @@
        'Read only' iterator used to iterate over a column
      */
-    typedef const_iterator const_column_iterator;
+    typedef boost::permutation_iterator<
+      utility::MatrixWeighted::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 boost::permutation_iterator<
+      utility::MatrixWeighted::const_row_iterator,
+      utility::Index::const_iterator> const_row_iterator;
 
     /**