Changeset 2154


Ignore:
Timestamp:
Jan 17, 2010, 11:21:29 PM (12 years ago)
Author:
Peter
Message:

using BOOST_CONCEPT_ASSERT. closes #603

Location:
trunk/yat
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/yat/normalizer/Centralizer.h

    r2146 r2154  
    8282                    OutputIterator result) const
    8383    {
    84       boost::function_requires<boost::InputIterator<InputIterator> >();
     84      BOOST_CONCEPT_ASSERT((boost::InputIterator<InputIterator>));
    8585      typename utility::weighted_iterator_traits<InputIterator>::type tag;
    8686      normalize(first, last, result, tag);
  • trunk/yat/normalizer/Gauss.h

    r2148 r2154  
    6969                    RandomAccessIter2 result) const
    7070    {
    71       boost::function_requires<boost::RandomAccessIterator<RandomAccessIter1> >();
    72       boost::function_requires<boost::Mutable_RandomAccessIterator<RandomAccessIter2> >();
     71      BOOST_CONCEPT_ASSERT((boost::RandomAccessIterator<RandomAccessIter1>));
     72      BOOST_CONCEPT_ASSERT((boost::Mutable_RandomAccessIterator<RandomAccessIter2>));
    7373      Spearman spearman;
    7474      spearman(first, last, result);
  • trunk/yat/normalizer/Spearman.h

    r2152 r2154  
    7070                    RandomAccessIter2 result) const
    7171    {
    72       using boost::function_requires;
    73       function_requires<boost::RandomAccessIterator<RandomAccessIter1> >();
    74       function_requires<boost::Mutable_RandomAccessIterator<RandomAccessIter2> >();
     72      BOOST_CONCEPT_ASSERT((boost::RandomAccessIterator<RandomAccessIter1>));
     73      BOOST_CONCEPT_ASSERT((boost::Mutable_RandomAccessIterator<RandomAccessIter2>));
    7574      typename utility::weighted_iterator_traits<RandomAccessIter1>::type tag;
    7675      normalize(first, last, result, tag);
  • trunk/yat/normalizer/qQuantileNormalizer.h

    r2150 r2154  
    254254                                 utility::unweighted_iterator_tag tag) const
    255255  {
    256     using boost::function_requires;
    257     function_requires<boost::RandomAccessIterator<RandomAccessIterator1> >();
    258     function_requires<boost::Mutable_RandomAccessIterator<RandomAccessIterator2> >();
     256    BOOST_CONCEPT_ASSERT((boost::RandomAccessIterator<RandomAccessIterator1>));
     257    BOOST_CONCEPT_ASSERT((boost::Mutable_RandomAccessIterator<RandomAccessIterator2>));
    259258    utility::check_iterator_is_unweighted(first);
    260259    utility::check_iterator_is_unweighted(result);
     
    316315                                      utility::weighted_iterator_tag tag) const
    317316  {
    318     using boost::function_requires;
    319     function_requires<boost::RandomAccessIterator<RandomAccessIterator1> >();
    320     function_requires<boost::Mutable_RandomAccessIterator<RandomAccessIterator2> >();
     317    BOOST_CONCEPT_ASSERT((boost::RandomAccessIterator<RandomAccessIterator1>));
     318    BOOST_CONCEPT_ASSERT((boost::Mutable_RandomAccessIterator<RandomAccessIterator2>));
    321319    // copy the weights
    322320    std::copy(utility::weight_iterator(first),
     
    384382    : average_(utility::Vector(N)), quantiles_(utility::Vector(N))
    385383  {
    386     boost::function_requires<boost::ForwardIterator<ForwardIterator> >();
     384    BOOST_CONCEPT_ASSERT((boost::ForwardIterator<ForwardIterator>));
    387385    build(first, last, N,
    388386          typename utility::weighted_iterator_traits<ForwardIterator>::type());
  • trunk/yat/random/random.h

    r2145 r2154  
    611611  {
    612612    typedef RandomAccessIterator rai;
    613     typedef boost::Mutable_RandomAccessIteratorConcept<rai> mric;
    614     boost::function_requires<mric>();
     613    BOOST_CONCEPT_ASSERT((boost::Mutable_RandomAccessIterator<rai>));
    615614    DiscreteUniform rnd;
    616615    std::random_shuffle(first, last, rnd);
Note: See TracChangeset for help on using the changeset viewer.