Changeset 3149

Timestamp:

Dec 23, 2013, 7:02:47 AM (10 years ago)

Author:

Peter

Message:

change test_output_iterator: there is requirement that output iterators have value_type

File:

• trunk/test/Suite.h (modified) (12 diffs)

trunk/test/Suite.h

@@ -127 +127 @@
     template<typename TrivialIterator>
     void test_trivial_iterator(const TrivialIterator&);
-    
+
     template<typename InputIterator>
     void test_input_iterator(InputIterator&);
-    
+
     template<typename OutputIterator>
     void test_output_iterator(OutputIterator&);
-  
+
     template<typename ForwardIterator>
     void test_forward_iterator(ForwardIterator);
-    
+
     template<typename BidirectionalIterator>
     void test_bidirectional_iterator(BidirectionalIterator);
-    
+
     template<typename RandomAccessIterator>
     void test_random_access_iterator(RandomAccessIterator);
@@ -202 +202 @@
     typedef T value_type;
     typedef const T& const_reference;
-    typedef const T* const_iterator; 
+    typedef const T* const_iterator;
     typedef const_iterator const_column_iterator;
     typedef const_iterator const_row_iterator;
@@ -213 +213 @@
     size_t columns(void) const { return 0; }
     size_t rows(void) const { return 0; }
-    const_reference operator()(size_t row, size_t column) const 
+    const_reference operator()(size_t row, size_t column) const
     { return element_; }
 
@@ -232 +232 @@
   public:
     typedef T& reference;
-    typedef T* iterator; 
+    typedef T* iterator;
     typedef iterator column_iterator;
     typedef iterator row_iterator;
@@ -278 +278 @@
   public:
     neighbor_weighting_archetype(void) {}
-    void operator()(const utility::VectorBase& distance, 
+    void operator()(const utility::VectorBase& distance,
                     const std::vector<size_t>& k_sorted,
-                    const classifier::Target& target, 
+                    const classifier::Target& target,
                     utility::VectorMutable& prediction) const {}
     neighbor_weighting_archetype& operator=(const neighbor_weighting_archetype&)
@@ -341 +341 @@
     bool ok = ss2.str()==ss.str();
     if (!ok) {
-      this->err() << "ERROR: first object gave following output:\n" 
+      this->err() << "ERROR: first object gave following output:\n"
                   << ss.str() << "\n"
-                  << "ERROR: and second object gave following output:\n" 
+                  << "ERROR: and second object gave following output:\n"
                   << ss2.str() << "\n";
     }
@@ -358 +358 @@
     default_constructed == default_constructed; // avoid compiler warning
   }
-  
+
   template<typename InputIterator>
   void Suite::test_input_iterator(InputIterator& iter)
@@ -370 +370 @@
     }
   }
-  
+
   template<typename OutputIterator>
   void Suite::test_output_iterator(OutputIterator& iter)
   {
-    test_trivial_iterator(iter);
     err() << "  testing Output features" << std::endl;
-  }
-  
+    // OutputIterator should be default constructible and assignable
+    OutputIterator oi;
+    oi = iter;
+    ++oi;
+  }
+
   template<typename ForwardIterator>
   void Suite::test_forward_iterator(ForwardIterator iter)
@@ -384 +387 @@
     test_input_iterator(iter);
     err() << "  testing Forward features" << std::endl;
-    
+
     typename std::iterator_traits<ForwardIterator>::value_type tmp = *iter;
     // testing multiple traversing is possible and does not change the data
@@ -394 +397 @@
     add(tmp==*iter);
   }
-  
+
   template<typename BidirectionalIterator>
   void Suite::test_bidirectional_iterator(BidirectionalIterator iter)
@@ -433 +436 @@
       err() << "operator-(int) failed" << std::endl;
     add(++iter2 == iter3);
-    
+
     RandomAccessIterator iter5 = iter + 0;
     RandomAccessIterator iter6 = 0 + iter;
     add(iter6 == iter5);
-    
+
     RandomAccessIterator iter7 = iter - 0;
     add(iter7 == iter);
     add(iter7 - iter == 0);
     add(! (iter7<iter));
-    
+
     typename RandomAccessIterator::value_type tmp = iter[0];
     typename RandomAccessIterator::value_type tmp2 = *iter;
@@ -490 +493 @@
     column_iterator ci = mc.begin_column(0);
     row_iterator ri = mc.begin_row(0);
-    *i = *ci; 
-    *ci = *i; 
-    *ri = *i; 
+    *i = *ci;
+    *ci = *i;
+    *ri = *i;
     i = mc.end();
     ci = mc.end_column(0);