Changeset 1090

Timestamp:

Feb 14, 2008, 4:22:54 PM (16 years ago)

Author:

Peter

Message:

adding const_iterator typedef for MatrixLookupWeighted? refs #267

Location:

trunk/yat/classifier

Files:

• DataLookupWeighted1D.h (modified) (5 diffs)
• MatrixLookupWeighted.h (modified) (2 diffs)

trunk/yat/classifier/DataLookupWeighted1D.h

@@ -26 +26 @@
 */
 
-#include "DataLookup2D.h"
+#include "MatrixLookupWeighted.h"
 #include "yat/utility/Iterator.h"
 #include "yat/utility/IteratorPolicy.h"
@@ -39 +39 @@
 namespace classifier {  
 
-  class MatrixLookupWeighted;
-
   ///
   /// @brief Class for general weighted vector view.
@@ -52 +50 @@
     /// 'Read Only' iterator
     typedef utility::StrideIterator<
-    utility::Iterator<const DataLookup2D, const std::pair<double, double>, 
-                      void, const std::pair<double, double>,
-                      utility::IteratorPolicyWeighted<const DataLookup2D,
+    utility::Iterator<const MatrixLookupWeighted, 
+                      const std::pair<double, double>, void, 
+                      const std::pair<double, double>,
+                      utility::IteratorPolicyWeighted<const MatrixLookupWeighted,
                                                       const double,
                                                       const double> > >
@@ -63 +62 @@
     ///
     /// @param row_vector if true (default) DataLookup1D is
-    /// looking into a row of DataLookup2D, otherwise looking into
+    /// looking into a row of MatrixLookupWeighted, otherwise looking into
     /// a column. @param index which row/column to look into.
     ///
@@ -76 +75 @@
     ///
     /// Construct DataLookup1D that owns its underlying matrix. Object
-    /// has size @ size and all its element is equal to @a value.
+    /// has size \a size and all its element is equal to \a value.
     ///
     DataLookupWeighted1D(const size_t size, double value=0, double weight=1); 

trunk/yat/classifier/MatrixLookupWeighted.h

@@ -27 +27 @@
 
 #include "DataLookup2D.h"
+#include "yat/utility/Iterator.h"
+#include "yat/utility/IteratorPolicy.h"
+#include "yat/utility/StrideIterator.h"
 
 #include <iostream>
+#include <utility>
 #include <vector>
 
@@ -66 +70 @@
   
   public:
-
+    /// 'Read Only' iterator
+    typedef utility::StrideIterator<
+    utility::Iterator<const MatrixLookupWeighted, 
+                      const std::pair<double, double>, void,  
+                      const std::pair<double, double>,
+                      utility::IteratorPolicyWeighted<const MatrixLookupWeighted,
+                                                      const double,
+                                                      const double> > >
+    const_iterator;
 
     ///