Changeset 1490

Timestamp:

Sep 12, 2008, 12:10:26 AM (15 years ago)

Author:

Peter

Message:

fixes #440

The bug was introduced in trunk after 0.4 release, so it has never
seen daylight.

Location:

trunk

Files:

• test/iterator_test.cc (modified) (5 diffs)
• yat/utility/StrideIterator.h (modified) (7 diffs)

trunk/test/iterator_test.cc

@@ -32 +32 @@
 #include "yat/utility/stl_utility.h"
 #include "yat/utility/Vector.h"
+#include "yat/utility/VectorView.h"
+#include "yat/utility/VectorConstView.h"
 #include "yat/utility/WeightIterator.h"
 
@@ -72 +74 @@
 void test_random_access_iterator(RandomAccessIterator, test::Suite&);
 
+void test_stride_iterator(test::Suite& suite);
+
 int main(int argc, char* argv[])
 {  
@@ -77 +81 @@
   suite.err() << "testing iterator" << std::endl;
 
+  test_stride_iterator(suite);
   old_main(suite);
   test_boost_util(suite);
@@ -111 +116 @@
     suite.add(false);
 
+  suite.err() << "sorting...";
   utility::Vector::iterator end=vec.end();
   std::sort(begin, end);
+  suite.err() << " sorting done\n";
 
   suite.err() << "testing classifier::DataLookup1D::const_iterator" << std::endl;
@@ -371 +378 @@
   if (ok_cached && !suite.ok())
     suite.err() << "failed" << std::endl;
-  
-
-}
+}
+
+void test_stride_iterator(test::Suite& suite)
+{
+  suite.err() << "testing StrideIterator" << std::endl;
+  using utility::Vector;
+  Vector a(10);
+  // stride 2
+  utility::VectorConstView b(a, 0, 5, 2);
+  if (!suite.add(b.end()-b.begin()==5))
+    suite.err() << "ERROR: StrideIterator::operator- returned: " 
+                << b.end()-b.begin() 
+                << " expected 5\n";
+  utility::VectorView c(a, 0, 3, 2);
+  Vector::iterator begin = c.begin();
+  Vector::iterator end = c.end();
+  Vector::const_iterator cbegin = begin;
+  Vector::const_iterator cend = end;
+
+  if (!suite.add(c.size()==3))
+    suite.err() << "c.size() incorrect" << std::endl;
+  if (!suite.add(cend-cbegin == 3))
+    suite.err() << "cend-cbegin failed\n"; 
+}

trunk/yat/utility/StrideIterator.h

@@ -23 +23 @@
   along with yat. If not, see <http://www.gnu.org/licenses/>.
 */
+
+// debug
+#include <iostream> 
 
 #include "iterator_traits.h"
@@ -88 +91 @@
     : public boost::iterator_adaptor<StrideIterator<Iter>, Iter>
   {
+    typedef boost::iterator_adaptor<StrideIterator<Iter>,Iter> super_t;
+
   public:
     /// type of underlying iterator
     typedef Iter iterator_type;
+
+    /*
     /// value type
     typedef typename std::iterator_traits<Iter>::value_type value_type;
@@ -101 +108 @@
     /// weighted_iterator_tag if iterator is weighted
     typedef typename yat::utility::weighted_iterator_traits<Iter>::type w_type;
+    */
 
     /**
@@ -107 +115 @@
        Using default constructor of BASE iterator.
      */
-    StrideIterator(size_t stride=1)
+    explicit StrideIterator(size_t stride=1)
       : StrideIterator::iterator_adaptor_(), stride_(stride) {}
 
@@ -117 +125 @@
 
     
+    /**
+       \brief Copy constructor
+     */
+    StrideIterator(const StrideIterator& other)
+      : StrideIterator::iterator_adaptor_(other.base()), stride_(other.stride()) 
+    {}
+
     /**
        \brief Conversion constructor. 
@@ -130 +145 @@
         stride_(other.stride()) {}
 
+    /** 
+        \brief Assignment operator
+     */
+    StrideIterator& operator=(const StrideIterator& rhs)
+    {
+      stride_ = rhs.stride();
+      this->base_reference() = rhs.base();
+      return *this;
+    }
+
     /**
        \return stride
@@ -141 +166 @@
     size_t stride_;
 
+    //typedef typename StrideIterator::iterator_adaptor_::difference_type
     typedef typename StrideIterator::iterator_adaptor_::difference_type
     difference_t;
 
-    void advance(difference_t n){ this->base_reference() += stride_*n; }
+    void advance(typename super_t::difference_type n)
+    { this->base_reference() += stride_*n; }
+
     void decrement(void) { this->base_reference()-=stride_; }
 
     template <class OtherIterator>
-    difference_t distance_type(const StrideIterator<OtherIterator>& other) const
-    { return (other.base() - this->base())/stride_; }
+    typename super_t::difference_type 
+    distance_to(const StrideIterator<OtherIterator>& other) const
+    { 
+      // casting to int to avoid loss of sign in numerator
+      return (other.base() - this->base() )/static_cast<int>(stride_); 
+    }
 
     void increment(void) { this->base_reference()+=stride_; }
 
-    // Using compiler generated copy
-    //StrideIterator(const StrideIterator&);
-    //StrideIterator& operator=(const StrideIterator&);
   };