Changeset 1062 for trunk/yat/classifier

Timestamp:

Feb 10, 2008, 7:41:06 PM (16 years ago)

Author:

Peter

Message:

redesigning Iterator class to hold a 2D container rather than 1D as before. refs #267

Location:

trunk/yat/classifier

Files:

• DataLookup1D.cc (modified) (2 diffs)
• DataLookup1D.h (modified) (3 diffs)
• MatrixLookup.h (modified) (3 diffs)

trunk/yat/classifier/DataLookup1D.cc

@@ -95 +95 @@
   DataLookup1D::const_iterator DataLookup1D::begin(void) const
   {
-    return DataLookup1D::const_iterator(*this, 0);
+    typedef utility::Iterator<const DataLookup2D, const double> Iter;
+    if (column_vector_)
+      return const_iterator(Iter(*matrix_, 0, index_), matrix_->columns());
+    return const_iterator(Iter(*matrix_, index_, 0), 1);
   }
 
@@ -101 +104 @@
   DataLookup1D::const_iterator DataLookup1D::end(void) const
   {
-    return DataLookup1D::const_iterator(*this, size());
+    typedef utility::Iterator<const DataLookup2D, const double> Iter;
+    if (column_vector_)
+      return const_iterator(Iter(*matrix_, matrix_->rows(), index_), 
+                            matrix_->columns());
+    return const_iterator(Iter(*matrix_, index_+1, 0), 1);
   }
 

trunk/yat/classifier/DataLookup1D.h

@@ -27 +27 @@
 */
 
-#include "yat/utility/Functor.h"
+#include "DataLookup2D.h"
 #include "yat/utility/Iterator.h"
+#include "yat/utility/StrideIterator.h"
 
 #include <iostream>
@@ -40 +41 @@
 namespace classifier {  
 
-  class DataLookup2D;
-
   ///
   /// @brief Class for general vector view. 
   ///
-
   class DataLookup1D
   {
@@ -51 +49 @@
   public:
     /// 'Read Only' iterator
-    typedef utility::Iterator<const utility::ContIdentity<const double, 
-                                                          const DataLookup1D> > 
+    typedef utility::StrideIterator<utility::Iterator<const DataLookup2D, 
+                                                      const double> >
     const_iterator;
 

trunk/yat/classifier/MatrixLookup.h

@@ -28 +28 @@
 
 #include "DataLookup2D.h"
+#include "yat/utility/Iterator.h"
 
 #include <iostream>
@@ -69 +70 @@
   class MatrixLookup : public DataLookup2D
   {
-  
+    typedef utility::Iterator<const MatrixLookup, const double&> const_iterator;
+
   public:
-
-
     ///
     /// Constructor creating a lookup into the entire @a matrix. 
@@ -217 +217 @@
 
     /**
+     */
+    const_iterator begin(void) const;
+    const_iterator begin_row(size_t) const;
+    const_iterator begin_column(size_t) const;
+
+    /**
        the new MatrixLookup will consist of the rolumn vectors
        defined by @a index. This means that the returned MatrixLookup