Changeset 3547

Timestamp:

Dec 30, 2016, 12:47:33 PM (7 years ago)

Author:

Peter

Message:

refs #803; use boost iterator concepts in qQuantileNormalizer.

Location:

trunk

Files:

• test/normalization.cc (modified) (1 diff)
• yat/normalizer/qQuantileNormalizer.h (modified) (6 diffs)

trunk/test/normalization.cc

@@ -220 +220 @@
          boost::random_access_iterator_archetype<DataWeight>(),
          boost::mutable_random_access_iterator_archetype<double>());
+
+    // test against boost iterator concepts
+    typedef test::DataIterator<boost::forward_traversal_tag> trait1;
+    trait1::unweighted_const_iterator input;
+    trait1::weighted_const_iterator weighted_input;
+    qQuantileNormalizer qqn5(input, input, 100);
+    qQuantileNormalizer qqn6(weighted_input, weighted_input, 100);
+
+    typedef test::DataIterator<boost::random_access_traversal_tag> trait2;
+    trait2::unweighted_const_iterator const_iterator;
+    trait2::unweighted_iterator iterator;
+    trait2::weighted_const_iterator const_weighted_iterator;
+    trait2::weighted_iterator weighted_iterator;
+    qqn5(const_iterator, const_iterator, iterator);
+    qqn5(const_iterator, const_iterator, weighted_iterator);
+    qqn5(const_weighted_iterator, const_weighted_iterator, iterator);
+    qqn5(const_iterator, const_iterator, weighted_iterator);
   }
 }

trunk/yat/normalizer/qQuantileNormalizer.h

@@ -112 +112 @@
 
        \b Type \b Requirements:
-       - \c ForwardIterator is a model of \forward_iterator.
+       - \c ForwardIterator is a model of \forward_traversal_iterator
        - \c ForwardIterator is a \ref concept_data_iterator
     */
@@ -134 +134 @@
 
        \b Type Requirements:
-       - \c RandomAccessIterator1 is a model of \random_access_iterator
        - \c RandomAccessIterator1 is a \ref concept_data_iterator
-       - \c RandomAccessIterator1's value type is convertible to
-         \c RandomAccessIterator2's value type
-       - \c RandomAccessIterator2 is a model of \random_access_iterator
-       - \c RandomAccessIterator2 is mutable.
+       - \c RandomAccessIterator1 is a \random_access_traversal_iterator
+       - \c RandomAccessIterator2 is a \ref concept_data_iterator
+       - \c RandomAccessIterator2 is a \random_access_traversal_iterator
+       - \c RandomAccessIterator2 is a \writable_iterator
 
      */
@@ -243 +242 @@
                                        RandomAccessIterator2 result) const
   {
+    BOOST_CONCEPT_ASSERT((utility::DataIterator<RandomAccessIterator1>));
+    using boost_concepts::RandomAccessTraversal;
+    BOOST_CONCEPT_ASSERT((RandomAccessTraversal<RandomAccessIterator1>));
+    BOOST_CONCEPT_ASSERT((utility::DataIterator<RandomAccessIterator2>));
+    BOOST_CONCEPT_ASSERT((RandomAccessTraversal<RandomAccessIterator2>));
+    using boost_concepts::WritableIterator;
+    BOOST_CONCEPT_ASSERT((WritableIterator<RandomAccessIterator2>));
+
     Partitioner source(first, last, target_.size());
     typename utility::weighted_if_any2<RandomAccessIterator1, RandomAccessIterator2>::type tag;
@@ -257 +264 @@
                                  utility::unweighted_iterator_tag tag) const
   {
-    BOOST_CONCEPT_ASSERT((boost::RandomAccessIterator<RandomAccessIterator1>));
-    BOOST_CONCEPT_ASSERT((boost::Mutable_RandomAccessIterator<RandomAccessIterator2>));
-    BOOST_CONCEPT_ASSERT((utility::DataIteratorConcept<RandomAccessIterator1>));
-    BOOST_CONCEPT_ASSERT((utility::DataIteratorConcept<RandomAccessIterator2>));
     utility::check_iterator_is_unweighted(first);
     utility::check_iterator_is_unweighted(result);
@@ -318 +321 @@
                                       utility::weighted_iterator_tag tag) const
   {
-    BOOST_CONCEPT_ASSERT((boost::RandomAccessIterator<RandomAccessIterator1>));
-    BOOST_CONCEPT_ASSERT((boost::Mutable_RandomAccessIterator<RandomAccessIterator2>));
-    BOOST_CONCEPT_ASSERT((utility::DataIterator<RandomAccessIterator1>));
-    BOOST_CONCEPT_ASSERT((utility::DataIterator<RandomAccessIterator2>));
     // copy the weights
     detail::copy_weight_if_weighted(first, last, result);
@@ -385 +384 @@
     : average_(utility::Vector(N)), quantiles_(utility::Vector(N))
   {
-    BOOST_CONCEPT_ASSERT((boost::ForwardIterator<ForwardIterator>));
+    BOOST_CONCEPT_ASSERT((boost_concepts::ForwardTraversal<ForwardIterator>));
     BOOST_CONCEPT_ASSERT((utility::DataIterator<ForwardIterator>));
     build(first, last, N,