mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-05-10 09:23:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix generator_iterator

Browse source 
fix random::begin, end
add random::combine_copy
This commit is contained in:
bolero-MURAKAMI 2012-09-27 21:57:51 +09:00
parent f40ee0a2ff
commit 10e9a7679d
4 changed files with 39 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sprout/iterator/generator_iterator.hpp
View file

@ -17,16 +17,16 @@ namespace sprout {
class generator_iterator class generator_iterator
: public std::iterator< : public std::iterator<
std::forward_iterator_tag, std::forward_iterator_tag,
typename std::remove_reference<decltype(sprout::generators::generated_value(std::declval<Generator>()))>::type, typename std::remove_reference<decltype(sprout::generators::generated_value(std::declval<Generator const>()))>::type,
std::ptrdiff_t, std::ptrdiff_t,
typename std::remove_reference<decltype(sprout::generators::generated_value(std::declval<Generator>()))>::type*, typename std::remove_reference<decltype(sprout::generators::generated_value(std::declval<Generator const>()))>::type*,
decltype(sprout::generators::generated_value(std::declval<Generator>())) decltype(sprout::generators::generated_value(std::declval<Generator const>()))
> >
{ {
public: public:
typedef Generator generator_type; typedef Generator generator_type;
typedef std::forward_iterator_tag iterator_category; typedef std::forward_iterator_tag iterator_category;
typedef decltype(sprout::generators::generated_value(std::declval<Generator>())) reference; typedef decltype(sprout::generators::generated_value(std::declval<Generator const>())) reference;
typedef typename std::remove_reference<reference>::type value_type; typedef typename std::remove_reference<reference>::type value_type;
typedef std::ptrdiff_t difference_type; typedef std::ptrdiff_t difference_type;
typedef value_type* pointer; typedef value_type* pointer;
@ -96,7 +96,10 @@ namespace sprout {
SPROUT_CONSTEXPR reference operator*() const { SPROUT_CONSTEXPR reference operator*() const {
return count_ != 0 return count_ != 0
? sprout::generators::generated_value(gen_) ? sprout::generators::generated_value(gen_)
: (throw std::out_of_range("generator_iterator<>: dereference at out of range"), gen_.result()) : (
throw std::out_of_range("generator_iterator<>: dereference at out of range"),
sprout::generators::generated_value(gen_)
)
; ;
} }
SPROUT_CONSTEXPR pointer operator->() const { SPROUT_CONSTEXPR pointer operator->() const {

25
sprout/random/iterator.hpp
View file

@ -1,7 +1,6 @@
#ifndef SPROUT_RANDOM_ITERATOR_HPP #ifndef SPROUT_RANDOM_ITERATOR_HPP
#define SPROUT_RANDOM_ITERATOR_HPP #define SPROUT_RANDOM_ITERATOR_HPP
#include <utility>
#include <type_traits> #include <type_traits>
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/iterator/generator_iterator.hpp> #include <sprout/iterator/generator_iterator.hpp>
@ -14,26 +13,26 @@ namespace sprout {
// //
template< template<
typename Engine, typename Distribution, typename Engine, typename Distribution,
typename sprout::enabler_if<!std::is_integral<Distribution>::value>::tyep = sprout::enabler typename sprout::enabler_if<!std::is_integral<Distribution>::value>::type = sprout::enabler
> >
inline SPROUT_CONSTEXPR auto inline SPROUT_CONSTEXPR auto
begin( begin(
Engine const& engine, Distribution const& distribution, Engine const& engine, Distribution const& distribution,
typename sprout::generator_iterator<typename std::decay<decltype(distribution(engine))>::type>::difference_type count = -1 typename sprout::generator_iterator<typename std::remove_reference<decltype(distribution(engine))>::type>::difference_type count = -1
) )
-> sprout::generator_iterator<typename std::decay<decltype(distribution(engine))>::type> -> sprout::generator_iterator<typename std::remove_reference<decltype(distribution(engine))>::type>
{ {
return sprout::generator_iterator<typename std::decay<decltype(distribution(engine))>::type>(distribution(engine), count); return sprout::generator_iterator<typename std::remove_reference<decltype(distribution(engine))>::type>(distribution(engine), count);
} }
template<typename Engine> template<typename Engine>
inline SPROUT_CONSTEXPR auto inline SPROUT_CONSTEXPR auto
begin( begin(
Engine const& engine, Engine const& engine,
typename sprout::generator_iterator<typename std::decay<decltype(engine())>::type>::difference_type count = -1 typename sprout::generator_iterator<typename std::remove_reference<decltype(engine())>::type>::difference_type count = -1
) )
-> sprout::generator_iterator<typename std::decay<decltype(engine())>::type> -> sprout::generator_iterator<typename std::remove_reference<decltype(engine())>::type>
{ {
return sprout::generator_iterator<typename std::decay<decltype(engine())>::type>(engine(), count); return sprout::generator_iterator<typename std::remove_reference<decltype(engine())>::type>(engine(), count);
} }
// //
@ -41,20 +40,20 @@ namespace sprout {
// //
template< template<
typename Engine, typename Distribution, typename Engine, typename Distribution,
typename sprout::enabler_if<!std::is_integral<Distribution>::value>::tyep = sprout::enabler typename sprout::enabler_if<!std::is_integral<Distribution>::value>::type = sprout::enabler
> >
inline SPROUT_CONSTEXPR auto inline SPROUT_CONSTEXPR auto
end(Engine const& engine, Distribution const& distribution) end(Engine const& engine, Distribution const& distribution)
-> sprout::generator_iterator<typename std::decay<decltype(distribution(engine))>::type> -> sprout::generator_iterator<typename std::remove_reference<decltype(distribution(engine))>::type>
{ {
return sprout::generator_iterator<typename std::decay<decltype(distribution(engine))>::type>(); return sprout::generator_iterator<typename std::remove_reference<decltype(distribution(engine))>::type>();
} }
template<typename Engine> template<typename Engine>
inline SPROUT_CONSTEXPR auto inline SPROUT_CONSTEXPR auto
end(Engine const& engine) end(Engine const& engine)
-> sprout::generator_iterator<typename std::decay<decltype(engine())>::type> -> sprout::generator_iterator<typename std::remove_reference<decltype(engine())>::type>
{ {
return sprout::generator_iterator<typename std::decay<decltype(engine())>::type>(); return sprout::generator_iterator<typename std::remove_reference<decltype(engine())>::type>();
} }
} // namespace random } // namespace random
} // namespace sprout } // namespace sprout

16
sprout/random/random_result.hpp
View file

@ -280,13 +280,13 @@ namespace sprout {
// generated_value // generated_value
// //
template<typename Engine, typename Distribution> template<typename Engine, typename Distribution>
inline SPROUT_CONSTEXPR typename sprout::random::random_result<Engine, Distribution>::result_type const& inline typename sprout::random::random_result<Engine, Distribution>::result_type&
generated_value(sprout::random::random_result<Engine, Distribution> const& t) { generated_value(sprout::random::random_result<Engine, Distribution>& t) {
return t.generated_value(); return t.generated_value();
} }
template<typename Engine, typename Distribution> template<typename Engine, typename Distribution>
inline typename sprout::random::random_result<Engine, Distribution>::result_type& inline SPROUT_CONSTEXPR typename sprout::random::random_result<Engine, Distribution>::result_type const&
generated_value(sprout::random::random_result<Engine, Distribution>& t) { generated_value(sprout::random::random_result<Engine, Distribution> const& t) {
return t.generated_value(); return t.generated_value();
} }
@ -294,13 +294,13 @@ namespace sprout {
// next_generator // next_generator
// //
template<typename Engine, typename Distribution> template<typename Engine, typename Distribution>
inline SPROUT_CONSTEXPR typename sprout::random::random_result<Engine, Distribution> const& inline typename sprout::random::random_result<Engine, Distribution>&
next_generator(sprout::random::random_result<Engine, Distribution> const& t) { next_generator(sprout::random::random_result<Engine, Distribution>& t) {
return t.next_generator(); return t.next_generator();
} }
template<typename Engine, typename Distribution> template<typename Engine, typename Distribution>
inline typename sprout::random::random_result<Engine, Distribution>& inline SPROUT_CONSTEXPR typename sprout::random::random_result<Engine, Distribution> const&
next_generator(sprout::random::random_result<Engine, Distribution>& t) { next_generator(sprout::random::random_result<Engine, Distribution> const& t) {
return t.next_generator(); return t.next_generator();
} }
} // namespace random } // namespace random

16
sprout/random/variate_generator.hpp
View file

@ -67,13 +67,19 @@ namespace sprout {
// combine // combine
// //
template<typename Engine, typename Distribution> template<typename Engine, typename Distribution>
SPROUT_CONSTEXPR sprout::random::variate_generator<Engine const&, Distribution const&> combine( inline SPROUT_CONSTEXPR sprout::random::variate_generator<Engine const&, Distribution const&>
Engine const& engine, combine(Engine const& engine, Distribution const& distribution) {
Distribution const& distribution
)
{
return sprout::random::variate_generator<Engine const&, Distribution const&>(engine, distribution); return sprout::random::variate_generator<Engine const&, Distribution const&>(engine, distribution);
} }
//
// combine_copy
//
template<typename Engine, typename Distribution>
inline SPROUT_CONSTEXPR sprout::random::variate_generator<Engine, Distribution>
combine_copy(Engine const& engine, Distribution const& distribution) {
return sprout::random::variate_generator<Engine, Distribution>(engine, distribution);
}
} // namespace random } // namespace random
using sprout::random::variate_generator; using sprout::random::variate_generator;