Changeset 3544


Ignore:
Timestamp:
Dec 23, 2016, 8:42:56 AM (5 years ago)
Author:
Peter
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/normalization.cc

    r3543 r3544  
    376376  // compile test should not be run
    377377  if (false) {
    378     using boost::iterator_archetype;
    379     iterator_archetype<double,
    380                        boost::iterator_archetypes::readable_iterator_t,
    381                        boost::random_access_traversal_tag>
    382       readable_iterator;
    383 
    384     iterator_archetype<double,
    385                        boost::iterator_archetypes::readable_writable_iterator_t,
    386                        boost::random_access_traversal_tag>
    387       writable_iterator;
    388 
    389     // We have to use lvalue here because otherwise proxy classes
    390     // provided by boost kick in and they do not provide the needed
    391     // data() and weight() functions that e.g. DataWeightProxy does.
    392     iterator_archetype<utility::DataWeight,
    393                        boost::iterator_archetypes::readable_lvalue_iterator_t,
    394                        boost::random_access_traversal_tag>
    395       weighted_readable_iterator;
    396 
    397     iterator_archetype<utility::DataWeight,
    398                        boost::iterator_archetypes::writable_lvalue_iterator_t,
    399                        boost::random_access_traversal_tag>
    400       weighted_writable_iterator;
     378    typedef test::DataIterator<boost::random_access_traversal_tag> trait;
     379    trait::unweighted_const_iterator readable_iterator;
     380    trait::unweighted_iterator writable_iterator;
     381    trait::weighted_const_iterator weighted_readable_iterator;
     382    trait::weighted_iterator weighted_writable_iterator;
    401383
    402384    gauss(readable_iterator, readable_iterator, writable_iterator);
  • trunk/yat/normalizer/Gauss.h

    r3330 r3544  
    5959
    6060       Type Requirements:
    61        - \c RandomAccessIter1 is \readable_iterator
    62        - \c RandomAccessIter1 is \random_access_traversal_iterator
    63        - \c RandomAccessIter1 is \ref concept_data_iterator
    64        - \c RandomAccessIter2 is \readable_iterator
    65        - \c RandomAccessIter2 is \writable_iterator
    66        - \c RandomAccessIter2 is \random_access_traversal_iterator
    67        - \c RandomAccessIter2 is \ref concept_data_iterator
     61       Same as in Spearman
    6862
    6963       \see gsl_cdf_ugaussian_Pinv
Note: See TracChangeset for help on using the changeset viewer.