Skip to content

R
riscv-gcc-1
Commit 5bcb3b4d by Paolo Carlini Committed by Paolo Carlini
Options

re PR libstdc++/55169 (std::discrete_distribution::operator(generator&) makes… 

re PR libstdc++/55169 (std::discrete_distribution::operator(generator&) makes unnecessary copy of parameter vector)

2012-11-02  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/55169
	* include/bits/random.h: Remove all uses of param().
	(chi_squared_distribution<>::__generate_impl(_ForwardIterator,
	_ForwardIterator, _UniformRandomNumberGenerator&): Declare
	* include/bits/random.tcc: ... define.
	* include/ext/random: Remove all uses of param().

From-SVN: r193092
parent e570b479
Showing with 200 additions and 186 deletions
libstdc++-v3/ChangeLog
2012-11-02 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/55169
* include/bits/random.h: Remove all uses of param().
(chi_squared_distribution<>::__generate_impl(_ForwardIterator,
_ForwardIterator, _UniformRandomNumberGenerator&): Declare
* include/bits/random.tcc: ... define.
* include/ext/random: Remove all uses of param().
2012-11-02 Gerald Pfeifer <gerald@pfeifer.com> 2012-11-02 Gerald Pfeifer <gerald@pfeifer.com>
* doc/xml/manual/allocator.xml: Update reference to Hoard. * doc/xml/manual/allocator.xml: Update reference to Hoard.
......
libstdc++-v3/include/bits/random.h
...@@ -1767,7 +1767,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1767,7 +1767,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -1779,7 +1779,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1779,7 +1779,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -1796,6 +1796,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1796,6 +1796,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const param_type& __p) const param_type& __p)
{ this->__generate_impl(__f, __t, __urng, __p); } { this->__generate_impl(__f, __t, __urng, __p); }
/**
* @brief Return true if two uniform integer distributions have
* the same parameters.
*/
friend bool
operator==(const uniform_int_distribution& __d1,
const uniform_int_distribution& __d2)
{ return __d1._M_param == __d2._M_param; }
private: private:
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -1809,16 +1818,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1809,16 +1818,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @brief Return true if two uniform integer distributions have * @brief Return true if two uniform integer distributions have
* the same parameters.
*/
template<typename _IntType>
inline bool
operator==(const std::uniform_int_distribution<_IntType>& __d1,
const std::uniform_int_distribution<_IntType>& __d2)
{ return __d1.param() == __d2.param(); }
/**
* @brief Return true if two uniform integer distributions have
* different parameters. * different parameters.
*/ */
template<typename _IntType> template<typename _IntType>
...@@ -1972,7 +1971,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1972,7 +1971,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -1989,7 +1988,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1989,7 +1988,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -2006,6 +2005,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2006,6 +2005,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const param_type& __p) const param_type& __p)
{ this->__generate_impl(__f, __t, __urng, __p); } { this->__generate_impl(__f, __t, __urng, __p); }
/**
* @brief Return true if two uniform real distributions have
* the same parameters.
*/
friend bool
operator==(const uniform_real_distribution& __d1,
const uniform_real_distribution& __d2)
{ return __d1._M_param == __d2._M_param; }
private: private:
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -2019,16 +2027,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2019,16 +2027,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @brief Return true if two uniform real distributions have * @brief Return true if two uniform real distributions have
* the same parameters.
*/
template<typename _IntType>
inline bool
operator==(const std::uniform_real_distribution<_IntType>& __d1,
const std::uniform_real_distribution<_IntType>& __d2)
{ return __d1.param() == __d2.param(); }
/**
* @brief Return true if two uniform real distributions have
* different parameters. * different parameters.
*/ */
template<typename _IntType> template<typename _IntType>
...@@ -2195,7 +2193,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2195,7 +2193,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -2207,7 +2205,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2207,7 +2205,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -2397,7 +2395,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2397,7 +2395,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -2410,7 +2408,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2410,7 +2408,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -2435,7 +2433,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2435,7 +2433,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const lognormal_distribution& __d1, operator==(const lognormal_distribution& __d1,
const lognormal_distribution& __d2) const lognormal_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_nd == __d2._M_nd); } && __d1._M_nd == __d2._M_nd); }
/** /**
...@@ -2619,7 +2617,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2619,7 +2617,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -2631,7 +2629,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2631,7 +2629,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -2656,7 +2654,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2656,7 +2654,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const gamma_distribution& __d1, operator==(const gamma_distribution& __d1,
const gamma_distribution& __d2) const gamma_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_nd == __d2._M_nd); } && __d1._M_nd == __d2._M_nd); }
/** /**
...@@ -2824,7 +2822,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2824,7 +2822,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate_impl(__f, __t, __urng, _M_gd.param()); } { this->__generate_impl(__f, __t, __urng); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -2840,9 +2838,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2840,9 +2838,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(result_type* __f, result_type* __t, __generate(result_type* __f, result_type* __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ typename std::gamma_distribution<result_type>::param_type { this->__generate_impl(__f, __t, __urng); }
__p2(_M_gd.param());
this->__generate_impl(__f, __t, __urng, __p2); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
void void
...@@ -2861,7 +2857,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2861,7 +2857,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const chi_squared_distribution& __d1, operator==(const chi_squared_distribution& __d1,
const chi_squared_distribution& __d2) const chi_squared_distribution& __d2)
{ return __d1.param() == __d2.param() && __d1._M_gd == __d2._M_gd; } { return __d1._M_param == __d2._M_param && __d1._M_gd == __d2._M_gd; }
/** /**
* @brief Inserts a %chi_squared_distribution random number distribution * @brief Inserts a %chi_squared_distribution random number distribution
...@@ -2898,9 +2894,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2898,9 +2894,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
void void
__generate_impl(_ForwardIterator __f, _ForwardIterator __t, __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng);
template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator>
void
__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng, _UniformRandomNumberGenerator& __urng,
typename std::gamma_distribution<result_type>::param_type& const typename
__p); std::gamma_distribution<result_type>::param_type& __p);
param_type _M_param; param_type _M_param;
...@@ -3024,7 +3026,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3024,7 +3026,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -3036,7 +3038,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3036,7 +3038,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -3053,6 +3055,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3053,6 +3055,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const param_type& __p) const param_type& __p)
{ this->__generate_impl(__f, __t, __urng, __p); } { this->__generate_impl(__f, __t, __urng, __p); }
/**
* @brief Return true if two Cauchy distributions have
* the same parameters.
*/
friend bool
operator==(const cauchy_distribution& __d1,
const cauchy_distribution& __d2)
{ return __d1._M_param == __d2._M_param; }
private: private:
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -3066,16 +3077,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3066,16 +3077,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @brief Return true if two Cauchy distributions have * @brief Return true if two Cauchy distributions have
* the same parameters.
*/
template<typename _RealType>
inline bool
operator==(const std::cauchy_distribution<_RealType>& __d1,
const std::cauchy_distribution<_RealType>& __d2)
{ return __d1.param() == __d2.param(); }
/**
* @brief Return true if two Cauchy distributions have
* different parameters. * different parameters.
*/ */
template<typename _RealType> template<typename _RealType>
...@@ -3278,7 +3279,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3278,7 +3279,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const fisher_f_distribution& __d1, operator==(const fisher_f_distribution& __d1,
const fisher_f_distribution& __d2) const fisher_f_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_gd_x == __d2._M_gd_x && __d1._M_gd_x == __d2._M_gd_x
&& __d1._M_gd_y == __d2._M_gd_y); } && __d1._M_gd_y == __d2._M_gd_y); }
...@@ -3492,7 +3493,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3492,7 +3493,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const student_t_distribution& __d1, operator==(const student_t_distribution& __d1,
const student_t_distribution& __d2) const student_t_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_nd == __d2._M_nd && __d1._M_gd == __d2._M_gd); } && __d1._M_nd == __d2._M_nd && __d1._M_gd == __d2._M_gd); }
/** /**
...@@ -3664,7 +3665,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3664,7 +3665,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -3684,7 +3685,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3684,7 +3685,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -3700,6 +3701,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3700,6 +3701,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const param_type& __p) const param_type& __p)
{ this->__generate_impl(__f, __t, __urng, __p); } { this->__generate_impl(__f, __t, __urng, __p); }
/**
* @brief Return true if two Bernoulli distributions have
* the same parameters.
*/
friend bool
operator==(const bernoulli_distribution& __d1,
const bernoulli_distribution& __d2)
{ return __d1._M_param == __d2._M_param; }
private: private:
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -3713,15 +3723,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3713,15 +3723,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @brief Return true if two Bernoulli distributions have * @brief Return true if two Bernoulli distributions have
* the same parameters.
*/
inline bool
operator==(const std::bernoulli_distribution& __d1,
const std::bernoulli_distribution& __d2)
{ return __d1.param() == __d2.param(); }
/**
* @brief Return true if two Bernoulli distributions have
* different parameters. * different parameters.
*/ */
inline bool inline bool
...@@ -3892,7 +3893,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3892,7 +3893,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -3904,7 +3905,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3904,7 +3905,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -3930,9 +3931,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3930,9 +3931,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator==(const binomial_distribution& __d1, operator==(const binomial_distribution& __d1,
const binomial_distribution& __d2) const binomial_distribution& __d2)
#ifdef _GLIBCXX_USE_C99_MATH_TR1 #ifdef _GLIBCXX_USE_C99_MATH_TR1
{ return __d1.param() == __d2.param() && __d1._M_nd == __d2._M_nd; } { return __d1._M_param == __d2._M_param && __d1._M_nd == __d2._M_nd; }
#else #else
{ return __d1.param() == __d2.param(); } { return __d1._M_param == __d2._M_param; }
#endif #endif
/** /**
...@@ -4104,7 +4105,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4104,7 +4105,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -4116,7 +4117,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4116,7 +4117,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -4133,6 +4134,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4133,6 +4134,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const param_type& __p) const param_type& __p)
{ this->__generate_impl(__f, __t, __urng, __p); } { this->__generate_impl(__f, __t, __urng, __p); }
/**
* @brief Return true if two geometric distributions have
* the same parameters.
*/
friend bool
operator==(const geometric_distribution& __d1,
const geometric_distribution& __d2)
{ return __d1._M_param == __d2._M_param; }
private: private:
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -4146,16 +4156,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4146,16 +4156,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @brief Return true if two geometric distributions have * @brief Return true if two geometric distributions have
* the same parameters.
*/
template<typename _IntType>
inline bool
operator==(const std::geometric_distribution<_IntType>& __d1,
const std::geometric_distribution<_IntType>& __d2)
{ return __d1.param() == __d2.param(); }
/**
* @brief Return true if two geometric distributions have
* different parameters. * different parameters.
*/ */
template<typename _IntType> template<typename _IntType>
...@@ -4349,7 +4349,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4349,7 +4349,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const negative_binomial_distribution& __d1, operator==(const negative_binomial_distribution& __d1,
const negative_binomial_distribution& __d2) const negative_binomial_distribution& __d2)
{ return __d1.param() == __d2.param() && __d1._M_gd == __d2._M_gd; } { return __d1._M_param == __d2._M_param && __d1._M_gd == __d2._M_gd; }
/** /**
* @brief Inserts a %negative_binomial_distribution random * @brief Inserts a %negative_binomial_distribution random
...@@ -4529,7 +4529,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4529,7 +4529,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -4541,7 +4541,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4541,7 +4541,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -4567,9 +4567,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4567,9 +4567,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator==(const poisson_distribution& __d1, operator==(const poisson_distribution& __d1,
const poisson_distribution& __d2) const poisson_distribution& __d2)
#ifdef _GLIBCXX_USE_C99_MATH_TR1 #ifdef _GLIBCXX_USE_C99_MATH_TR1
{ return __d1.param() == __d2.param() && __d1._M_nd == __d2._M_nd; } { return __d1._M_param == __d2._M_param && __d1._M_nd == __d2._M_nd; }
#else #else
{ return __d1.param() == __d2.param(); } { return __d1._M_param == __d2._M_param; }
#endif #endif
/** /**
...@@ -4739,7 +4739,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4739,7 +4739,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -4756,7 +4756,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4756,7 +4756,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -4773,6 +4773,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4773,6 +4773,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const param_type& __p) const param_type& __p)
{ this->__generate_impl(__f, __t, __urng, __p); } { this->__generate_impl(__f, __t, __urng, __p); }
/**
* @brief Return true if two exponential distributions have the same
* parameters.
*/
friend bool
operator==(const exponential_distribution& __d1,
const exponential_distribution& __d2)
{ return __d1._M_param == __d2._M_param; }
private: private:
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -4785,16 +4794,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4785,16 +4794,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
/** /**
* @brief Return true if two exponential distributions have the same
* parameters.
*/
template<typename _RealType>
inline bool
operator==(const std::exponential_distribution<_RealType>& __d1,
const std::exponential_distribution<_RealType>& __d2)
{ return __d1.param() == __d2.param(); }
/**
* @brief Return true if two exponential distributions have different * @brief Return true if two exponential distributions have different
* parameters. * parameters.
*/ */
...@@ -4948,7 +4947,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4948,7 +4947,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -4960,7 +4959,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4960,7 +4959,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -4977,6 +4976,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4977,6 +4976,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const param_type& __p) const param_type& __p)
{ this->__generate_impl(__f, __t, __urng, __p); } { this->__generate_impl(__f, __t, __urng, __p); }
/**
* @brief Return true if two Weibull distributions have the same
* parameters.
*/
friend bool
operator==(const weibull_distribution& __d1,
const weibull_distribution& __d2)
{ return __d1._M_param == __d2._M_param; }
private: private:
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -4989,16 +4997,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -4989,16 +4997,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
/** /**
* @brief Return true if two Weibull distributions have the same
* parameters.
*/
template<typename _RealType>
inline bool
operator==(const std::weibull_distribution<_RealType>& __d1,
const std::weibull_distribution<_RealType>& __d2)
{ return __d1.param() == __d2.param(); }
/**
* @brief Return true if two Weibull distributions have different * @brief Return true if two Weibull distributions have different
* parameters. * parameters.
*/ */
...@@ -5152,7 +5150,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5152,7 +5150,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -5164,7 +5162,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5164,7 +5162,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -5181,6 +5179,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5181,6 +5179,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const param_type& __p) const param_type& __p)
{ this->__generate_impl(__f, __t, __urng, __p); } { this->__generate_impl(__f, __t, __urng, __p); }
/**
* @brief Return true if two extreme value distributions have the same
* parameters.
*/
friend bool
operator==(const extreme_value_distribution& __d1,
const extreme_value_distribution& __d2)
{ return __d1._M_param == __d2._M_param; }
private: private:
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -5193,16 +5200,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5193,16 +5200,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
/** /**
* @brief Return true if two extreme value distributions have the same
* parameters.
*/
template<typename _RealType>
inline bool
operator==(const std::extreme_value_distribution<_RealType>& __d1,
const std::extreme_value_distribution<_RealType>& __d2)
{ return __d1.param() == __d2.param(); }
/**
* @brief Return true if two extreme value distributions have different * @brief Return true if two extreme value distributions have different
* parameters. * parameters.
*/ */
...@@ -5382,7 +5379,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5382,7 +5379,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -5394,7 +5391,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5394,7 +5391,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -5412,6 +5409,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5412,6 +5409,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ this->__generate_impl(__f, __t, __urng, __p); } { this->__generate_impl(__f, __t, __urng, __p); }
/** /**
* @brief Return true if two discrete distributions have the same
* parameters.
*/
friend bool
operator==(const discrete_distribution& __d1,
const discrete_distribution& __d2)
{ return __d1._M_param == __d2._M_param; }
/**
* @brief Inserts a %discrete_distribution random number distribution * @brief Inserts a %discrete_distribution random number distribution
* @p __x into the output stream @p __os. * @p __x into the output stream @p __os.
* *
...@@ -5454,16 +5460,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5454,16 +5460,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
/** /**
* @brief Return true if two discrete distributions have the same
* parameters.
*/
template<typename _IntType>
inline bool
operator==(const std::discrete_distribution<_IntType>& __d1,
const std::discrete_distribution<_IntType>& __d2)
{ return __d1.param() == __d2.param(); }
/**
* @brief Return true if two discrete distributions have different * @brief Return true if two discrete distributions have different
* parameters. * parameters.
*/ */
...@@ -5649,7 +5645,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5649,7 +5645,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -5661,7 +5657,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5661,7 +5657,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -5679,6 +5675,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5679,6 +5675,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ this->__generate_impl(__f, __t, __urng, __p); } { this->__generate_impl(__f, __t, __urng, __p); }
/** /**
* @brief Return true if two piecewise constant distributions have the
* same parameters.
*/
friend bool
operator==(const piecewise_constant_distribution& __d1,
const piecewise_constant_distribution& __d2)
{ return __d1._M_param == __d2._M_param; }
/**
* @brief Inserts a %piecewise_constan_distribution random * @brief Inserts a %piecewise_constan_distribution random
* number distribution @p __x into the output stream @p __os. * number distribution @p __x into the output stream @p __os.
* *
...@@ -5722,16 +5727,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5722,16 +5727,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
/** /**
* @brief Return true if two piecewise constant distributions have the
* same parameters.
*/
template<typename _RealType>
inline bool
operator==(const std::piecewise_constant_distribution<_RealType>& __d1,
const std::piecewise_constant_distribution<_RealType>& __d2)
{ return __d1.param() == __d2.param(); }
/**
* @brief Return true if two piecewise constant distributions have * @brief Return true if two piecewise constant distributions have
* different parameters. * different parameters.
*/ */
...@@ -5920,7 +5915,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5920,7 +5915,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -5932,7 +5927,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5932,7 +5927,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -5950,6 +5945,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5950,6 +5945,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ this->__generate_impl(__f, __t, __urng, __p); } { this->__generate_impl(__f, __t, __urng, __p); }
/** /**
* @brief Return true if two piecewise linear distributions have the
* same parameters.
*/
friend bool
operator==(const piecewise_linear_distribution& __d1,
const piecewise_linear_distribution& __d2)
{ return __d1._M_param == __d2._M_param; }
/**
* @brief Inserts a %piecewise_linear_distribution random number * @brief Inserts a %piecewise_linear_distribution random number
* distribution @p __x into the output stream @p __os. * distribution @p __x into the output stream @p __os.
* *
...@@ -5993,16 +5997,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -5993,16 +5997,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
/** /**
* @brief Return true if two piecewise linear distributions have the
* same parameters.
*/
template<typename _RealType>
inline bool
operator==(const std::piecewise_linear_distribution<_RealType>& __d1,
const std::piecewise_linear_distribution<_RealType>& __d2)
{ return __d1.param() == __d2.param(); }
/**
* @brief Return true if two piecewise linear distributions have * @brief Return true if two piecewise linear distributions have
* different parameters. * different parameters.
*/ */
......
libstdc++-v3/include/bits/random.tcc
...@@ -2150,6 +2150,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2150,6 +2150,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __is; return __is;
} }
template<typename _RealType>
template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator>
void
std::chi_squared_distribution<_RealType>::
__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng)
{
__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
while (__f != __t)
*__f++ = 2 * _M_gd(__urng);
}
template<typename _RealType> template<typename _RealType>
template<typename _ForwardIterator, template<typename _ForwardIterator,
...@@ -2158,8 +2170,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2158,8 +2170,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
std::chi_squared_distribution<_RealType>:: std::chi_squared_distribution<_RealType>::
__generate_impl(_ForwardIterator __f, _ForwardIterator __t, __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng, _UniformRandomNumberGenerator& __urng,
typename std::gamma_distribution<result_type>::param_type& const typename
__p) std::gamma_distribution<result_type>::param_type& __p)
{ {
__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
while (__f != __t) while (__f != __t)
......
libstdc++-v3/include/ext/random
...@@ -510,7 +510,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -510,7 +510,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -522,7 +522,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -522,7 +522,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -540,6 +540,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -540,6 +540,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ this->__generate_impl(__f, __t, __urng, __p); } { this->__generate_impl(__f, __t, __urng, __p); }
/** /**
* @brief Return true if two beta distributions have the same
* parameters and the sequences that would be generated
* are equal.
*/
friend bool
operator==(const beta_distribution& __d1,
const beta_distribution& __d2)
{ return __d1._M_param == __d2._M_param; }
/**
* @brief Inserts a %beta_distribution random number distribution * @brief Inserts a %beta_distribution random number distribution
* @p __x into the output stream @p __os. * @p __x into the output stream @p __os.
* *
...@@ -580,17 +590,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -580,17 +590,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
/** /**
* @brief Return true if two beta distributions have the same
* parameters and the sequences that would be generated
* are equal.
*/
template<typename _RealType>
inline bool
operator==(const __gnu_cxx::beta_distribution<_RealType>& __d1,
const __gnu_cxx::beta_distribution<_RealType>& __d2)
{ return __d1.param() == __d2.param(); }
/**
* @brief Return true if two beta distributions are different. * @brief Return true if two beta distributions are different.
*/ */
template<typename _RealType> template<typename _RealType>
...@@ -809,7 +808,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -809,7 +808,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -821,7 +820,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -821,7 +820,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ return this->__generate_impl(__f, __t, __urng, this->param()); } { return this->__generate_impl(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -1073,7 +1072,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1073,7 +1072,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -1098,7 +1097,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1098,7 +1097,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const rice_distribution& __d1, operator==(const rice_distribution& __d1,
const rice_distribution& __d2) const rice_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_ndx == __d2._M_ndx && __d1._M_ndx == __d2._M_ndx
&& __d1._M_ndy == __d2._M_ndy); } && __d1._M_ndy == __d2._M_ndy); }
...@@ -1296,7 +1295,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1296,7 +1295,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -1321,7 +1320,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1321,7 +1320,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const nakagami_distribution& __d1, operator==(const nakagami_distribution& __d1,
const nakagami_distribution& __d2) const nakagami_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_gd == __d2._M_gd); } && __d1._M_gd == __d2._M_gd); }
/** /**
...@@ -1532,7 +1531,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1532,7 +1531,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -1557,7 +1556,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1557,7 +1556,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const pareto_distribution& __d1, operator==(const pareto_distribution& __d1,
const pareto_distribution& __d2) const pareto_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_ud == __d2._M_ud); } && __d1._M_ud == __d2._M_ud); }
/** /**
...@@ -1774,7 +1773,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1774,7 +1773,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -1799,7 +1798,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1799,7 +1798,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const k_distribution& __d1, operator==(const k_distribution& __d1,
const k_distribution& __d2) const k_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_gd1 == __d2._M_gd1 && __d1._M_gd1 == __d2._M_gd1
&& __d1._M_gd2 == __d2._M_gd2); } && __d1._M_gd2 == __d2._M_gd2); }
...@@ -2006,7 +2005,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2006,7 +2005,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -2031,7 +2030,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2031,7 +2030,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const arcsine_distribution& __d1, operator==(const arcsine_distribution& __d1,
const arcsine_distribution& __d2) const arcsine_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_ud == __d2._M_ud); } && __d1._M_ud == __d2._M_ud); }
/** /**
...@@ -2241,7 +2240,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2241,7 +2240,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -2266,7 +2265,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2266,7 +2265,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const hoyt_distribution& __d1, operator==(const hoyt_distribution& __d1,
const hoyt_distribution& __d2) const hoyt_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_ad == __d2._M_ad && __d1._M_ad == __d2._M_ad
&& __d1._M_ed == __d2._M_ed); } && __d1._M_ed == __d2._M_ed); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment