Commit f070285a by Richard Henderson Committed by Richard Henderson

poly_laguerre.tcc: s/__alpha/__alpha1/g.

        * include/tr1/poly_laguerre.tcc: s/__alpha/__alpha1/g.
        * include/tr1/ell_integral.tcc: Likewise.

From-SVN: r123407
parent 5b52976b
2007-04-01 Richard Henderson <rth@redhat.com>
* include/tr1/poly_laguerre.tcc: s/__alpha/__alpha1/g.
* include/tr1/ell_integral.tcc: Likewise.
2007-03-31 Paolo Carlini <pcarlini@suse.de> 2007-03-31 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_bvector.h (_M_fill_insert(iterator, size_type, * include/bits/stl_bvector.h (_M_fill_insert(iterator, size_type,
......
...@@ -627,9 +627,9 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1) ...@@ -627,9 +627,9 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
const _Tp __znroot = std::sqrt(__zn); const _Tp __znroot = std::sqrt(__zn);
const _Tp __lambda = __xnroot * (__ynroot + __znroot) const _Tp __lambda = __xnroot * (__ynroot + __znroot)
+ __ynroot * __znroot; + __ynroot * __znroot;
const _Tp __alpha = __pn * (__xnroot + __ynroot + __znroot) const _Tp __alpha1 = __pn * (__xnroot + __ynroot + __znroot)
+ __xnroot * __ynroot * __znroot; + __xnroot * __ynroot * __znroot;
const _Tp __alpha2 = __alpha * __alpha; const _Tp __alpha2 = __alpha1 * __alpha1;
const _Tp __beta = __pn * (__pn + __lambda) const _Tp __beta = __pn * (__pn + __lambda)
* (__pn + __lambda); * (__pn + __lambda);
__sigma += __power4 * __ellint_rc(__alpha2, __beta); __sigma += __power4 * __ellint_rc(__alpha2, __beta);
......
...@@ -80,11 +80,11 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1) ...@@ -80,11 +80,11 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
*/ */
template<typename _Tpa, typename _Tp> template<typename _Tpa, typename _Tp>
_Tp _Tp
__poly_laguerre_large_n(const unsigned __n, const _Tpa __alpha, __poly_laguerre_large_n(const unsigned __n, const _Tpa __alpha1,
const _Tp __x) const _Tp __x)
{ {
const _Tp __a = -_Tp(__n); const _Tp __a = -_Tp(__n);
const _Tp __b = _Tp(__alpha) + _Tp(1); const _Tp __b = _Tp(__alpha1) + _Tp(1);
const _Tp __eta = _Tp(2) * __b - _Tp(4) * __a; const _Tp __eta = _Tp(2) * __b - _Tp(4) * __a;
const _Tp __cos2th = __x / __eta; const _Tp __cos2th = __x / __eta;
const _Tp __sin2th = _Tp(1) - __cos2th; const _Tp __sin2th = _Tp(1) - __cos2th;
...@@ -135,9 +135,10 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1) ...@@ -135,9 +135,10 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
*/ */
template<typename _Tpa, typename _Tp> template<typename _Tpa, typename _Tp>
_Tp _Tp
__poly_laguerre_hyperg(const unsigned int __n, const _Tpa __alpha, const _Tp __x) __poly_laguerre_hyperg(const unsigned int __n, const _Tpa __alpha1,
const _Tp __x)
{ {
const _Tp __b = _Tp(__alpha) + _Tp(1); const _Tp __b = _Tp(__alpha1) + _Tp(1);
const _Tp __mx = -__x; const _Tp __mx = -__x;
const _Tp __tc_sgn = (__x < _Tp(0) ? _Tp(1) const _Tp __tc_sgn = (__x < _Tp(0) ? _Tp(1)
: ((__n % 2 == 1) ? -_Tp(1) : _Tp(1))); : ((__n % 2 == 1) ? -_Tp(1) : _Tp(1)));
...@@ -192,7 +193,7 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1) ...@@ -192,7 +193,7 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
template<typename _Tpa, typename _Tp> template<typename _Tpa, typename _Tp>
_Tp _Tp
__poly_laguerre_recursion(const unsigned int __n, __poly_laguerre_recursion(const unsigned int __n,
const _Tpa __alpha, const _Tp __x) const _Tpa __alpha1, const _Tp __x)
{ {
// Compute l_0. // Compute l_0.
_Tp __l_0 = _Tp(1); _Tp __l_0 = _Tp(1);
...@@ -200,7 +201,7 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1) ...@@ -200,7 +201,7 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
return __l_0; return __l_0;
// Compute l_1^alpha. // Compute l_1^alpha.
_Tp __l_1 = -__x + _Tp(1) + _Tp(__alpha); _Tp __l_1 = -__x + _Tp(1) + _Tp(__alpha1);
if (__n == 1) if (__n == 1)
return __l_1; return __l_1;
...@@ -210,9 +211,9 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1) ...@@ -210,9 +211,9 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
_Tp __l_n = _Tp(0); _Tp __l_n = _Tp(0);
for (unsigned int __nn = 2; __nn <= __n; ++__nn) for (unsigned int __nn = 2; __nn <= __n; ++__nn)
{ {
__l_n = (_Tp(2 * __nn - 1) + _Tp(__alpha) - __x) __l_n = (_Tp(2 * __nn - 1) + _Tp(__alpha1) - __x)
* __l_n1 / _Tp(__nn) * __l_n1 / _Tp(__nn)
- (_Tp(__nn - 1) + _Tp(__alpha)) * __l_n2 / _Tp(__nn); - (_Tp(__nn - 1) + _Tp(__alpha1)) * __l_n2 / _Tp(__nn);
__l_n2 = __l_n1; __l_n2 = __l_n1;
__l_n1 = __l_n; __l_n1 = __l_n;
} }
...@@ -251,7 +252,7 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1) ...@@ -251,7 +252,7 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
*/ */
template<typename _Tpa, typename _Tp> template<typename _Tpa, typename _Tp>
inline _Tp inline _Tp
__poly_laguerre(const unsigned int __n, const _Tpa __alpha, __poly_laguerre(const unsigned int __n, const _Tpa __alpha1,
const _Tp __x) const _Tp __x)
{ {
if (__x < _Tp(0)) if (__x < _Tp(0))
...@@ -263,22 +264,22 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1) ...@@ -263,22 +264,22 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
else if (__n == 0) else if (__n == 0)
return _Tp(1); return _Tp(1);
else if (__n == 1) else if (__n == 1)
return _Tp(1) + _Tp(__alpha) - __x; return _Tp(1) + _Tp(__alpha1) - __x;
else if (__x == _Tp(0)) else if (__x == _Tp(0))
{ {
_Tp __prod = _Tp(__alpha) + _Tp(1); _Tp __prod = _Tp(__alpha1) + _Tp(1);
for (unsigned int __k = 2; __k <= __n; ++__k) for (unsigned int __k = 2; __k <= __n; ++__k)
__prod *= (_Tp(__alpha) + _Tp(__k)) / _Tp(__k); __prod *= (_Tp(__alpha1) + _Tp(__k)) / _Tp(__k);
return __prod; return __prod;
} }
else if (__n > 10000000 && _Tp(__alpha) > -_Tp(1) else if (__n > 10000000 && _Tp(__alpha1) > -_Tp(1)
&& __x < _Tp(2) * (_Tp(__alpha) + _Tp(1)) + _Tp(4 * __n)) && __x < _Tp(2) * (_Tp(__alpha1) + _Tp(1)) + _Tp(4 * __n))
return __poly_laguerre_large_n(__n, __alpha, __x); return __poly_laguerre_large_n(__n, __alpha1, __x);
else if (_Tp(__alpha) >= _Tp(0) else if (_Tp(__alpha) >= _Tp(0)
|| (__x > _Tp(0) && _Tp(__alpha) < -_Tp(__n + 1))) || (__x > _Tp(0) && _Tp(__alpha1) < -_Tp(__n + 1)))
return __poly_laguerre_recursion(__n, __alpha, __x); return __poly_laguerre_recursion(__n, __alpha1, __x);
else else
return __poly_laguerre_hyperg(__n, __alpha, __x); return __poly_laguerre_hyperg(__n, __alpha1, __x);
} }
......
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