Changeset 3544

Timestamp:

Dec 23, 2016, 8:42:56 AM (7 years ago)

Author:

Peter

Message:

refs #803. use boost iterator categories in normalizer::Gauss

Location:

trunk

Files:

• test/normalization.cc (modified) (1 diff)
• yat/normalizer/Gauss.h (modified) (1 diff)

trunk/test/normalization.cc

@@ -376 +376 @@
   // compile test should not be run
   if (false) {
-    using boost::iterator_archetype;
-    iterator_archetype<double,
-                       boost::iterator_archetypes::readable_iterator_t,
-                       boost::random_access_traversal_tag>
-      readable_iterator;
-
-    iterator_archetype<double,
-                       boost::iterator_archetypes::readable_writable_iterator_t,
-                       boost::random_access_traversal_tag>
-      writable_iterator;
-
-    // We have to use lvalue here because otherwise proxy classes
-    // provided by boost kick in and they do not provide the needed
-    // data() and weight() functions that e.g. DataWeightProxy does.
-    iterator_archetype<utility::DataWeight,
-                       boost::iterator_archetypes::readable_lvalue_iterator_t,
-                       boost::random_access_traversal_tag>
-      weighted_readable_iterator;
-
-    iterator_archetype<utility::DataWeight,
-                       boost::iterator_archetypes::writable_lvalue_iterator_t,
-                       boost::random_access_traversal_tag>
-      weighted_writable_iterator;
+    typedef test::DataIterator<boost::random_access_traversal_tag> trait;
+    trait::unweighted_const_iterator readable_iterator;
+    trait::unweighted_iterator writable_iterator;
+    trait::weighted_const_iterator weighted_readable_iterator;
+    trait::weighted_iterator weighted_writable_iterator;
 
     gauss(readable_iterator, readable_iterator, writable_iterator);

trunk/yat/normalizer/Gauss.h

@@ -59 +59 @@
 
        Type Requirements:
-       - \c RandomAccessIter1 is \readable_iterator
-       - \c RandomAccessIter1 is \random_access_traversal_iterator
-       - \c RandomAccessIter1 is \ref concept_data_iterator
-       - \c RandomAccessIter2 is \readable_iterator
-       - \c RandomAccessIter2 is \writable_iterator
-       - \c RandomAccessIter2 is \random_access_traversal_iterator
-       - \c RandomAccessIter2 is \ref concept_data_iterator
+       Same as in Spearman
 
        \see gsl_cdf_ugaussian_Pinv