Changeset 880 for trunk/yat/utility

Timestamp:

Sep 22, 2007, 1:43:22 AM (14 years ago)

Author:

Peter

Message:

refs #244

Location:

trunk/yat/utility

Files:

• Iterator.h (added)
• Makefile.am (modified) (1 diff)
• constIterator.h (added)
• vector.cc (modified) (2 diffs)
• vector.h (modified) (4 diffs)

trunk/yat/utility/Makefile.am

@@ -32 +32 @@
 
 include_utility_HEADERS = \
-  Alignment.h Exception.h FileUtil.h kNNI.h matrix.h NNI.h  \
+  Alignment.h constIterator.h Exception.h FileUtil.h Iterator.h \
+  kNNI.h matrix.h NNI.h \
   PCA.h stl_utility.h SVD.h TypeInfo.h utility.h vector.h WeNNI.h

trunk/yat/utility/vector.cc

@@ -195 +195 @@
 
 
+  vector::iterator vector::begin(void)
+  {
+    return vector::iterator(*this, 0);
+  }
+
+
+  vector::const_iterator vector::begin(void) const
+  {
+    return vector::const_iterator(*this, 0);
+  }
+
+
   const vector& vector::clone(const vector& other)
   {
@@ -247 +259 @@
     if (status)
       throw utility::GSL_error(std::string("vector::div",status));
+  }
+
+
+  vector::iterator vector::end(void)
+  {
+    return vector::iterator(*this, size());
+  }
+
+
+  vector::const_iterator vector::end(void) const
+  {
+    return vector::const_iterator(*this, size());
   }
 

trunk/yat/utility/vector.h

@@ -29 +29 @@
 */
 
+#include "constIterator.h"
 #include "Exception.h"
+#include "Iterator.h"
 
 #include <iostream>
@@ -87 +89 @@
   public:
 
+    typedef Iterator<vector> iterator;
+    typedef constIterator<const vector> const_iterator;
+
     /**
        \brief The default constructor.
@@ -215 +220 @@
 
     /**
+     */
+    iterator begin(void);
+
+    /**
+     */
+    const_iterator begin(void) const;
+
+    /**
        \brief Make a copy of \a other.
 
@@ -229 +242 @@
     */
     void div(const vector& other);
+
+    /**
+     */
+    iterator end(void);
+
+    /**
+     */
+    const_iterator end(void) const;
 
     /**