From 9ea146e6da49a7fbd1fbace15c79aa372ebae3de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez-Ib=C3=A1=C3=B1ez?= Date: Mon, 4 Feb 2013 19:28:40 +0000 Subject: [PATCH] PR libstdc++/56202 (again) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2013-02-04 Manuel López-Ibáñez Paolo Carlini PR libstdc++/56202 (again) * include/bits/random.tcc (binomial_distribution<>:: _M_waiting(_UniformRandomNumberGenerator&, _IntType)): Fix thinko in previous commit. * include/bits/random.h: Fix comment typo. Co-Authored-By: Paolo Carlini From-SVN: r195732 --- libstdc++-v3/ChangeLog | 10 ++++++++++ libstdc++-v3/include/bits/random.h | 2 +- libstdc++-v3/include/bits/random.tcc | 8 ++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 077e48386c0..2c1ffd21598 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2013-02-04 Manuel López-Ibáñez + Paolo Carlini + + PR libstdc++/56202 (again) + * include/bits/random.tcc (binomial_distribution<>:: + _M_waiting(_UniformRandomNumberGenerator&, _IntType)): Fix thinko + in previous commit. + + * include/bits/random.h: Fix comment typo. + 2013-02-04 Manuel López-Ibáñez Paolo Carlini diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h index e1887e2978f..b471726be55 100644 --- a/libstdc++-v3/include/bits/random.h +++ b/libstdc++-v3/include/bits/random.h @@ -3770,7 +3770,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @brief A discrete binomial random number distribution. * * The formula for the binomial probability density function is - * @f$p(i|t,p) = \binom{n}{i} p^i (1 - p)^{t - i}@f$ where @f$t@f$ + * @f$p(i|t,p) = \binom{t}{i} p^i (1 - p)^{t - i}@f$ where @f$t@f$ * and @f$p@f$ are the parameters of the distribution. */ template diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc index 6220a5d61d4..acd458214e4 100644 --- a/libstdc++-v3/include/bits/random.tcc +++ b/libstdc++-v3/include/bits/random.tcc @@ -1657,13 +1657,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION do { - const double __e = -std::log(1.0 - __aurng()); if (__t == __x) - { - if (__e) - return __x; - continue; - } + return __x; + const double __e = -std::log(1.0 - __aurng()); __sum += __e / (__t - __x); __x += 1; }