Changeset 1091

Timestamp:

Feb 14, 2008, 5:26:31 PM (16 years ago)

Author:

Peter

Message:

fixes #267 iterator for MatrixLookupWeighted?

Location:

trunk/yat/classifier

Files:

• MatrixLookupWeighted.cc (modified) (2 diffs)
• MatrixLookupWeighted.h (modified) (1 diff)

trunk/yat/classifier/MatrixLookupWeighted.cc

@@ -244 +244 @@
 
 
+  MatrixLookupWeighted::const_iterator MatrixLookupWeighted::begin(void) const
+  {
+    return const_iterator(const_iterator::iterator_type(*this, 0, 0), 1);
+  }
+
+
+  MatrixLookupWeighted::const_iterator 
+  MatrixLookupWeighted::begin_column(size_t i) const
+  {
+    return const_iterator(const_iterator::iterator_type(*this, 0, i),columns());
+  }
+
+
+  MatrixLookupWeighted::const_iterator 
+  MatrixLookupWeighted::begin_row(size_t i) const
+  {
+    return const_iterator(const_iterator::iterator_type(*this, i, 0), 1);
+  }
+
+
   double MatrixLookupWeighted::data(size_t row, size_t column) const
   {
@@ -249 +269 @@
   }
 
+
+
+  MatrixLookupWeighted::const_iterator MatrixLookupWeighted::end(void) const
+  {
+    return const_iterator(const_iterator::iterator_type(*this, rows(), 0), 1);
+  }
+
+
+  MatrixLookupWeighted::const_iterator 
+  MatrixLookupWeighted::end_column(size_t i) const
+  {
+    return const_iterator(const_iterator::iterator_type(*this, rows(), i), 
+                          columns());
+  }
+
+
+  MatrixLookupWeighted::const_iterator 
+  MatrixLookupWeighted::end_row(size_t i) const
+  {
+    return const_iterator(const_iterator::iterator_type(*this, i+1, 0), 1);
+  }
 
 

trunk/yat/classifier/MatrixLookupWeighted.h

@@ -251 +251 @@
     virtual ~MatrixLookupWeighted();
 
+    /**
+       Iterator iterates along a row. When end of row is reached it
+       jumps to beginning of next row.
+
+       \return const_iterator pointing to upper-left element.
+     */
+    const_iterator begin(void) const;
+
+    /**
+       Iterator iterates along a column.
+
+       \return iterator pointing to first element of column \a i.
+     */
+    const_iterator begin_column(size_t) const;
+
+    /**
+       Iterator iterates along a column.
+
+       \return const_iterator pointing to first element of column \a i.
+     */
+    const_iterator begin_row(size_t) const;
+
     ///
     /// @return data value of element (@a row, @a column)
     ///
     double data(size_t row, size_t column) const;
+
+    /**
+       \return const_iterator pointing to end of matrix
+     */
+    const_iterator end(void) const;
+
+    /**
+       \return const_iterator pointing to end of column \a i
+     */
+    const_iterator end_column(size_t) const;
+
+    /**
+       \return const_iterator pointing to end of row \a i
+     */
+    const_iterator end_row(size_t) const;
 
     /**