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

random/geometric_distribution.hpp 追加

Browse source 
distribution のストリーム入力のバグ修正
This commit is contained in:
bolero-MURAKAMI 2011-10-14 21:23:13 +09:00
parent 16dfd793ab
commit 7ae0072f2e
7 changed files with 259 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
sprout/random/uniform_int_distribution.hpp
View file

@ -390,8 +390,11 @@ namespace sprout {
typedef IntType input_type;
typedef IntType result_type;
private:
static SPROUT_CONSTEXPR bool arg_check_nothrow(IntType min_arg, IntType max_arg) {
return min_arg <= max_arg;
}
static SPROUT_CONSTEXPR IntType arg_check(IntType min_arg, IntType max_arg) {
return min_arg <= max_arg
return arg_check_nothrow(min_arg, max_arg)
? min_arg
: throw "assert(min_arg <= max_arg)"
;
@ -427,7 +430,17 @@ namespace sprout {
param_type const& rhs
)
{
return lhs >> rhs.min_ >> std::ws >> rhs.max_;
IntType min;
IntType max;
if (lhs >> min >> std::ws >> max) {
if (arg_check_nothrow(min, max)) {
rhs.min_ = min;
rhs.max_ = max;
} else {
lhs.setstate(std::ios_base::failbit);
}
}
return lhs;
}
template<typename Elem, typename Traits>
friend std::basic_ostream<Elem, Traits>& operator<<(
@ -499,7 +512,7 @@ namespace sprout {
)
{
param_type parm;
return lhs >> parm;
lhs >> parm;
param(parm);
return lhs;
}