Changeset 1104

Timestamp:

Feb 18, 2008, 6:14:46 AM (15 years ago)

Author:

Peter

Message:

adding iterator typedefs in MatrixLookup?

Location:

trunk/yat/classifier

Files:

• MatrixLookup.cc (modified) (2 diffs)
• MatrixLookup.h (modified) (4 diffs)

trunk/yat/classifier/MatrixLookup.cc

@@ -167 +167 @@
 
 
-  MatrixLookup::const_iterator MatrixLookup::begin_column(size_t i) const
-  {
-    return const_iterator(const_iterator::iterator_type(*this, 0, i),columns());
-  }
-
-
-  MatrixLookup::const_iterator MatrixLookup::begin_row(size_t i) const
-  {
-    return const_iterator(const_iterator::iterator_type(*this, i, 0), 1);
+  MatrixLookup::const_column_iterator MatrixLookup::begin_column(size_t i) const
+  {
+    return const_column_iterator(const_iterator::iterator_type(*this, 0, i),
+                                 columns());
+  }
+
+
+  MatrixLookup::const_row_iterator MatrixLookup::begin_row(size_t i) const
+  {
+    return const_row_iterator(const_iterator::iterator_type(*this, i, 0), 1);
   }
 
@@ -185 +186 @@
 
 
-  MatrixLookup::const_iterator MatrixLookup::end_column(size_t i) const
-  {
-    return const_iterator(const_iterator::iterator_type(*this, rows(), i), 
-                          columns());
-  }
-
-
-  MatrixLookup::const_iterator MatrixLookup::end_row(size_t i) const
-  {
-    return const_iterator(const_iterator::iterator_type(*this, i+1, 0), 1);
+  MatrixLookup::const_column_iterator MatrixLookup::end_column(size_t i) const
+  {
+    return const_column_iterator(const_iterator::iterator_type(*this, rows(),i), 
+                                 columns());
+  }
+
+
+  MatrixLookup::const_row_iterator MatrixLookup::end_row(size_t i) const
+  {
+    return const_row_iterator(const_iterator::iterator_type(*this, i+1, 0), 1);
   }
 

trunk/yat/classifier/MatrixLookup.h

@@ -78 +78 @@
     const_iterator;
 
+    typedef const_iterator const_column_iterator;
+    typedef const_iterator const_row_iterator;
+
     ///
     /// Constructor creating a lookup into the entire @a matrix. 
@@ -234 +237 @@
        \return iterator pointing to first element of column \a i.
      */
-    const_iterator begin_column(size_t) const;
+    const_column_iterator begin_column(size_t) const;
 
     /**
@@ -241 +244 @@
        \return const_iterator pointing to first element of column \a i.
      */
-    const_iterator begin_row(size_t) const;
+    const_row_iterator begin_row(size_t) const;
 
     /**
@@ -251 +254 @@
        \return const_iterator pointing to end of column \a i
      */
-    const_iterator end_column(size_t) const;
+    const_column_iterator end_column(size_t) const;
 
     /**
        \return const_iterator pointing to end of row \a i
      */
-    const_iterator end_row(size_t) const;
+    const_row_iterator end_row(size_t) const;
 
     /**