fix taus88

This commit is contained in:
bolero-MURAKAMI 2013-11-10 21:23:09 +09:00
parent fc1d4421fd
commit 2b08b8e1d5
2 changed files with 4 additions and 4 deletions

View file

@ -20,13 +20,13 @@ namespace sprout {
// //
typedef sprout::random::xor_combine_engine< typedef sprout::random::xor_combine_engine<
sprout::random::xor_combine_engine< sprout::random::xor_combine_engine<
sprout::random::linear_feedback_shift_engine<std::uint_fast32_t, 32, 31, 13, 12>, sprout::random::linear_feedback_shift_engine<std::uint32_t, 32, 31, 13, 12>,
0, 0,
sprout::random::linear_feedback_shift_engine<std::uint_fast32_t, 32, 29, 2, 4>, sprout::random::linear_feedback_shift_engine<std::uint32_t, 32, 29, 2, 4>,
0 0
>, >,
0, 0,
sprout::random::linear_feedback_shift_engine<std::uint_fast32_t, 32, 28, 3, 17>, sprout::random::linear_feedback_shift_engine<std::uint32_t, 32, 28, 3, 17>,
0 0
> taus88; > taus88;
} // namespace random } // namespace random

View file

@ -108,7 +108,7 @@ namespace sprout {
return NS_SSCRISK_CEL_OR_SPROUT::min(rng1_.min(), rng2_.min()); return NS_SSCRISK_CEL_OR_SPROUT::min(rng1_.min(), rng2_.min());
} }
SPROUT_CONSTEXPR result_type max() const SPROUT_NOEXCEPT { SPROUT_CONSTEXPR result_type max() const SPROUT_NOEXCEPT {
return NS_SSCRISK_CEL_OR_SPROUT::max(rng1_.min(), rng2_.max()); return NS_SSCRISK_CEL_OR_SPROUT::max(rng1_.max(), rng2_.max());
} }
SPROUT_CXX14_CONSTEXPR result_type operator()() { SPROUT_CXX14_CONSTEXPR result_type operator()() {
return (static_cast<result_type>(rng1_()) << s1) ^ (static_cast<result_type>(rng2_()) << s2); return (static_cast<result_type>(rng1_()) << s1) ^ (static_cast<result_type>(rng2_()) << s2);