Changeset 1105 for trunk/yat/classifier

Timestamp:

Feb 18, 2008, 6:27:11 AM (16 years ago)

Author:

Peter

Message:

adding iterator typedefs in Lookups

Location:

trunk/yat/classifier

Files:

• KernelLookup.cc (modified) (2 diffs)
• KernelLookup.h (modified) (4 diffs)
• MatrixLookup.cc (modified) (4 diffs)
• MatrixLookupWeighted.cc (modified) (3 diffs)
• MatrixLookupWeighted.h (modified) (4 diffs)

trunk/yat/classifier/KernelLookup.cc

@@ -123 +123 @@
 
 
-  KernelLookup::const_iterator KernelLookup::begin_column(size_t i) const
-  {
-    return const_iterator(const_iterator::iterator_type(*this, 0, i), columns());
-  }
-
-
-  KernelLookup::const_iterator KernelLookup::begin_row(size_t i) const
-  {
-    return const_iterator(const_iterator::iterator_type(*this, i, 0), 1);
+  KernelLookup::const_column_iterator 
+  KernelLookup::begin_column(size_t i) const
+  {
+    return const_column_iterator(const_column_iterator::iterator_type(*this,
+                                                                      0,i), 
+                                 columns());
+  }
+
+
+  KernelLookup::const_row_iterator KernelLookup::begin_row(size_t i) const
+  {
+    return const_row_iterator(const_row_iterator::iterator_type(*this,i,0), 1);
   }
 
@@ -159 +162 @@
 
 
-  KernelLookup::const_iterator KernelLookup::end_column(size_t i) const
-  {
-    return const_iterator(const_iterator::iterator_type(*this, this->rows(), i),
-                          this->columns());
-  }
-
-
-  KernelLookup::const_iterator KernelLookup::end_row(size_t i) const
-  {
-    return const_iterator(const_iterator::iterator_type(*this, i+1, 0), 1);
+  KernelLookup::const_column_iterator KernelLookup::end_column(size_t i) const
+  {
+    return const_column_iterator(const_column_iterator::iterator_type(*this, 
+                                                                      rows(),i),
+                                 columns());
+  }
+
+
+  KernelLookup::const_row_iterator KernelLookup::end_row(size_t i) const
+  {
+    return const_row_iterator(const_row_iterator::iterator_type(*this,i+1,0),1);
   }
 

trunk/yat/classifier/KernelLookup.h

@@ -75 +75 @@
     const_iterator;
 
+    typedef const_iterator const_column_iterator;
+    typedef const_iterator const_row_iterator;
+
     ///
     /// @brief Constructor a Lookup into a Kernel
@@ -179 +182 @@
        \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;
 
     /**
@@ -186 +189 @@
        \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;
 
     ///
@@ -226 +229 @@
        \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;
 
     /**

trunk/yat/classifier/MatrixLookup.cc

@@ -169 +169 @@
   MatrixLookup::const_column_iterator MatrixLookup::begin_column(size_t i) const
   {
-    return const_column_iterator(const_iterator::iterator_type(*this, 0, i),
+    return const_column_iterator(const_column_iterator::iterator_type(*this, 0,
+                                                                      i),
                                  columns());
   }
@@ -176 +177 @@
   MatrixLookup::const_row_iterator MatrixLookup::begin_row(size_t i) const
   {
-    return const_row_iterator(const_iterator::iterator_type(*this, i, 0), 1);
+    return const_row_iterator(const_row_iterator::iterator_type(*this,i,0), 1);
   }
 
@@ -188 +189 @@
   MatrixLookup::const_column_iterator MatrixLookup::end_column(size_t i) const
   {
-    return const_column_iterator(const_iterator::iterator_type(*this, rows(),i), 
-                                 columns());
+    return 
+      const_column_iterator(const_column_iterator::iterator_type(*this,rows(),
+                                                                      i), 
+                            columns());
   }
 
@@ -195 +198 @@
   MatrixLookup::const_row_iterator MatrixLookup::end_row(size_t i) const
   {
-    return const_row_iterator(const_iterator::iterator_type(*this, i+1, 0), 1);
+    return const_row_iterator(const_row_iterator::iterator_type(*this,i+1,0),1);
   }
 

trunk/yat/classifier/MatrixLookupWeighted.cc

@@ -250 +250 @@
 
 
-  MatrixLookupWeighted::const_iterator 
+  MatrixLookupWeighted::const_column_iterator 
   MatrixLookupWeighted::begin_column(size_t i) const
   {
-    return const_iterator(const_iterator::iterator_type(*this, 0, i),columns());
+    return const_column_iterator(const_column_iterator::iterator_type(*this,0, 
+                                                                      i),
+                                 columns());
   }
 
@@ -260 +262 @@
   MatrixLookupWeighted::begin_row(size_t i) const
   {
-    return const_iterator(const_iterator::iterator_type(*this, i, 0), 1);
+    return const_row_iterator(const_row_iterator::iterator_type(*this,i, 0), 1);
   }
 
@@ -280 +282 @@
   MatrixLookupWeighted::end_column(size_t i) const
   {
-    return const_iterator(const_iterator::iterator_type(*this, rows(), i), 
-                          columns());
-  }
-
-
-  MatrixLookupWeighted::const_iterator 
+    return const_column_iterator(const_column_iterator::iterator_type(*this, 
+                                                                      rows(),i),
+                                 columns());
+  }
+
+
+  MatrixLookupWeighted::const_row_iterator 
   MatrixLookupWeighted::end_row(size_t i) const
   {
-    return const_iterator(const_iterator::iterator_type(*this, i+1, 0), 1);
+    return const_row_iterator(const_row_iterator::iterator_type(*this,i+1,0),1);
   }
 

trunk/yat/classifier/MatrixLookupWeighted.h

@@ -80 +80 @@
     const_iterator;
 
+    typedef const_iterator const_column_iterator;
+    typedef const_iterator const_row_iterator;
+
     ///
     /// Constructor creating a lookup into the entire \a matrix and \a
@@ -264 +267 @@
        \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;
 
     /**
@@ -271 +274 @@
        \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;
 
     ///
@@ -286 +289 @@
        \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;
 
     /**