Changeset 880

Timestamp:

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

Author:

Peter

Message:

refs #244

Location:

trunk

Files:

• test/Makefile.am (modified) (2 diffs)
• test/iterator_test.cc (added)
• yat/classifier/DataLookup1D.cc (modified) (1 diff)
• yat/classifier/DataLookup1D.h (modified) (3 diffs)
• yat/utility/Iterator.h (added)
• yat/utility/Makefile.am (modified) (1 diff)
• yat/utility/constIterator.h (added)
• yat/utility/vector.cc (modified) (2 diffs)
• yat/utility/vector.h (modified) (4 diffs)

trunk/test/Makefile.am

@@ -32 +32 @@
   distance_test \
   ensemble_test feature_selection_test fileutil_test inputranker_test \
-  kernel_test kernel_lookup_test matrix_test matrix_lookup_test       \
+  iterator_test kernel_test kernel_lookup_test matrix_test matrix_lookup_test \
   nbc_test \
   ncc_test nni_test pca_test regression_test rnd_test roc_test \
@@ -57 +57 @@
 fileutil_test_SOURCES = fileutil_test.cc
 inputranker_test_SOURCES = inputranker_test.cc
+iterator_test_SOURCES = iterator_test.cc
 kernel_test_SOURCES = kernel_test.cc
 kernel_lookup_test_SOURCES = kernel_lookup_test.cc

trunk/yat/classifier/DataLookup1D.cc

@@ -93 +93 @@
 
 
+  DataLookup1D::const_iterator DataLookup1D::begin(void) const
+  {
+    return DataLookup1D::const_iterator(*this, 0);
+  }
+
+
+  DataLookup1D::const_iterator DataLookup1D::end(void) const
+  {
+    return DataLookup1D::const_iterator(*this, size());
+  }
+
+
   size_t DataLookup1D::size(void) const
   {

trunk/yat/classifier/DataLookup1D.h

@@ -1 +1 @@
 #ifndef _theplu_yat_classifier_dataLookup1D_ 
 #define _theplu_yat_classifier_dataLookup1D_ 
+
+#include "yat/utility/constIterator.h"
+#include "yat/utility/Iterator.h"
 
 // $Id$
@@ -48 +51 @@
   public:
 
+    typedef utility::constIterator<const classifier::DataLookup1D> 
+    const_iterator;
+
     ///
     /// Constructor. 
@@ -91 +97 @@
     ///
     virtual ~DataLookup1D();
+
+    /**
+     */
+    const_iterator begin() const;
+
+    /**
+     */
+    const_iterator end() const;
 
     ///

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;
 
     /**