Changeset 3290

Timestamp:

Jul 12, 2014, 7:59:16 PM (9 years ago)

Author:

Peter

Message:

refs #803. Correct docs and reflect that random access iterators are needed. Change test and concept schecks to use boost concepts.

Location:

trunk

Files:

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

trunk/test/normalization.cc

@@ -374 +374 @@
   // compile test should not be run
   if (false) {
-    gauss(boost::random_access_iterator_archetype<double>(), 
-          boost::random_access_iterator_archetype<double>(),
-          boost::mutable_random_access_iterator_archetype<double>());
-    using utility::DataWeight;
-    gauss(boost::random_access_iterator_archetype<DataWeight>(), 
-          boost::random_access_iterator_archetype<DataWeight>(),
-          boost::mutable_random_access_iterator_archetype<DataWeight>());
-    gauss(boost::random_access_iterator_archetype<DataWeight>(), 
-          boost::random_access_iterator_archetype<DataWeight>(),
-          boost::mutable_random_access_iterator_archetype<double>());
-    gauss(boost::random_access_iterator_archetype<double>(), 
-          boost::random_access_iterator_archetype<double>(),
-          boost::mutable_random_access_iterator_archetype<DataWeight>());
+    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;
+
+    gauss(readable_iterator, readable_iterator, writable_iterator);
+    gauss(readable_iterator, readable_iterator, weighted_writable_iterator);
+    gauss(weighted_readable_iterator, weighted_readable_iterator,
+          writable_iterator);
+    gauss(weighted_readable_iterator, weighted_readable_iterator,
+          weighted_writable_iterator);
   }
 }

trunk/yat/normalizer/Gauss.h

@@ -43 +43 @@
      After normalization the range will follow a standard Gaussian
      distribution (mean zero and unity variance).
-     
+
      The range is first rank normalized using Spearman, after which
      each element is between 0 and unity. Second each element is
      replaced by inverse cumulative standard Gaussian distribution.
-     
+
      \since New in yat 0.5
    */
@@ -58 +58 @@
        same.
 
-       Type requirements:
-       - ForwardIterator must be a \forward_iterator and a \ref
-       concept_data_iterator. 
-       - RandomAccessIterator must be a mutable \random_access_iterator
-         and a \ref concept_data_iterator.
+       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
 
        \see gsl_cdf_ugaussian_Pinv
@@ -70 +73 @@
                     RandomAccessIter2 result) const
     {
-      BOOST_CONCEPT_ASSERT((utility::DataIteratorConcept<RandomAccessIter1>));
-      BOOST_CONCEPT_ASSERT((utility::DataIteratorConcept<RandomAccessIter2>));
-      BOOST_CONCEPT_ASSERT((boost::RandomAccessIterator<RandomAccessIter1>));
-      BOOST_CONCEPT_ASSERT((boost::Mutable_RandomAccessIterator<RandomAccessIter2>));
       Spearman spearman;
       spearman(first, last, result);