Changeset 1064

Timestamp:

Feb 10, 2008, 11:06:52 PM (16 years ago)

Author:

Peter

Message:

fixes #306 matrix iterators

Location:

trunk/yat/utility

Files:

• matrix.cc (modified) (2 diffs)
• matrix.h (modified) (5 diffs)

trunk/yat/utility/matrix.cc

@@ -160 +160 @@
 
 
+  matrix::iterator matrix::begin(void)
+  {
+    return iterator(&(*this)(0,0), 1);
+  }
+
+
+  matrix::const_iterator matrix::begin(void) const
+  {
+    return const_iterator(&(*this)(0,0), 1);
+  }
+
+
+  matrix::iterator matrix::begin_column(size_t i)
+  {
+    return iterator(&(*this)(0,i), this->columns());
+  }
+
+
+  matrix::const_iterator matrix::begin_column(size_t i) const
+  {
+    return const_iterator(&(*this)(0,i), this->columns());
+  }
+
+
+  matrix::iterator matrix::begin_row(size_t i)
+  {
+    return iterator(&(*this)(i,0), 1);
+  }
+
+
+  matrix::const_iterator matrix::begin_row(size_t i) const
+  {
+    return const_iterator(&(*this)(i,0), 1);
+  }
+
+
   const matrix& matrix::clone(const matrix& other)
   {
@@ -226 +262 @@
     if (status)
       throw utility::GSL_error(std::string("matrix::div_elements",status));
+  }
+
+
+  matrix::iterator matrix::end(void)
+  {
+    return iterator(&(*this)(0,0)+rows()*columns(), 1);
+  }
+
+
+  matrix::const_iterator matrix::end(void) const
+  {
+    return const_iterator(&(*this)(0,0)+rows()*columns(), 1);
+  }
+
+
+  matrix::iterator matrix::end_column(size_t i)
+  {
+    return iterator(&(*this)(0,i)+rows()*columns(), this->columns());
+  }
+
+
+  matrix::const_iterator matrix::end_column(size_t i) const
+  {
+    return const_iterator(&(*this)(0,i)+rows()*columns(), this->columns());
+  }
+
+
+  matrix::iterator matrix::end_row(size_t i)
+  {
+    return iterator(&(*this)(i,0)+columns(), 1);
+  }
+
+
+  matrix::const_iterator matrix::end_row(size_t i) const
+  {
+    return const_iterator(&(*this)(i,0)+columns(), 1);
   }
 

trunk/yat/utility/matrix.h

@@ -9 +9 @@
   Copyright (C) 2005, 2006 Jari Häkkinen, Markus Ringnér, Peter Johansson
   Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2008 Peter Johansson
 
   This file is part of the yat library, http://trac.thep.lu.se/yat
@@ -28 +29 @@
 */
 
+#include "Exception.h"
+#include "StrideIterator.h"
 #include "vector.h"
 #include "VectorConstView.h"
 #include "VectorView.h"
-#include "Exception.h"
 
 #include <gsl/gsl_matrix.h>
@@ -70 +72 @@
   {
   public:
+    /**
+     */
+    typedef StrideIterator<double*> iterator;
+
+    /**
+     */
+    typedef StrideIterator<const double*> const_iterator;
 
     /**
@@ -149 +158 @@
 
     /**
+     */
+    iterator begin(void);
+
+    /**
+     */
+    const_iterator begin(void) const;
+
+    /**
+     */
+    iterator begin_column(size_t);
+
+    /**
+     */
+    const_iterator begin_column(size_t) const;
+
+    /**
+     */
+    iterator begin_row(size_t);
+
+    /**
+     */
+    const_iterator begin_row(size_t) const;
+
+    /**
        \brief Make a copy of \a other.
 
@@ -177 +210 @@
     */
     void div(const matrix& b);
+
+    /**
+     */
+    iterator end(void);
+
+    /**
+     */
+    const_iterator end(void) const;
+
+    /**
+     */
+    iterator end_column(size_t);
+
+    /**
+     */
+    const_iterator end_column(size_t) const;
+
+    /**
+     */
+    iterator end_row(size_t);
+
+    /**
+     */
+    const_iterator end_row(size_t) const;
 
     /**