mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-12 14:54:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

random_iterator 修正

Browse source
This commit is contained in:
bolero-MURAKAMI 2011-10-02 21:07:58 +09:00
parent 3c03c120fb
commit a7c392cda8
4 changed files with 90 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

58
sprout/random/random_iterator.hpp
View file

@ -46,6 +46,7 @@ namespace sprout {
random_result_type random_;
difference_type count_;
public:
//random_iterator() = default; // ???
SPROUT_CONSTEXPR random_iterator()
: random_()
, count_()
@ -118,7 +119,7 @@ namespace sprout {
SPROUT_CONSTEXPR reference operator*() const {
return count_ != 0
? random_.result()
: throw "assert(count_ != 0)"
: (throw "assert(count_ != 0)", random_.result())
;
}
SPROUT_CONSTEXPR pointer operator->() const {
@ -165,6 +166,7 @@ namespace sprout {
random_result_type random_;
difference_type count_;
public:
//random_iterator() = default; // ???
SPROUT_CONSTEXPR random_iterator()
: random_()
, count_()
@ -230,7 +232,7 @@ namespace sprout {
SPROUT_CONSTEXPR reference operator*() const {
return count_ != 0
? random_.result()
: throw "assert(count_ != 0)"
: (throw "assert(count_ != 0)", random_.result())
;
}
SPROUT_CONSTEXPR pointer operator->() const {
@ -263,18 +265,62 @@ namespace sprout {
}
//
// next
// begin
//
template<typename Engine, typename Distribution>
SPROUT_CONSTEXPR sprout::random::random_iterator<Engine, Distribution> next(
sprout::random::random_iterator<Engine, Distribution> const& it
SPROUT_CONSTEXPR typename std::enable_if<
!std::is_integral<Distribution>::value,
sprout::random::random_iterator<Engine, Distribution>
>::type begin(
Engine const& engine,
Distribution const& distribution,
typename sprout::random::random_iterator<Engine, Distribution>::difference_type count = -1
)
{
return it();
return sprout::random::random_iterator<Engine, Distribution>(engine, distribution, count);
}
template<typename Engine>
SPROUT_CONSTEXPR sprout::random::random_iterator<Engine> begin(
Engine const& engine,
typename sprout::random::random_iterator<Engine>::difference_type count = -1
)
{
return sprout::random::random_iterator<Engine>(engine, count);
}
//
// end
//
template<typename Engine, typename Distribution>
SPROUT_CONSTEXPR sprout::random::random_iterator<Engine, Distribution> end(
Engine const& engine,
Distribution const& distribution
)
{
return sprout::random::random_iterator<Engine, Distribution>();
}
template<typename Engine>
SPROUT_CONSTEXPR sprout::random::random_iterator<Engine> end(
Engine const& engine
)
{
return sprout::random::random_iterator<Engine>();
}
} // namespace random
//
// next
//
template<typename Engine, typename Distribution>
SPROUT_CONSTEXPR sprout::random::random_iterator<Engine, Distribution> next(
sprout::random::random_iterator<Engine, Distribution> const& it
)
{
return it();
}
using sprout::random::random_iterator;
} // namespace sprout
#endif // #ifndef SPROUT_RANDOM_RANDOM_ITERATOR_HPP