Mercurial > octave
diff liboctave/numeric/lo-mappers.cc @ 21231:5f318c8ec634
eliminate feature tests from lo-specfun.h
* lo-specfun.h, lo-specfun.cc (xacosh, xasinh, xatanh, xerf, xerfc
xexpm1, xlog1p, xcbrt): Rename to have 'x' prefix. Conditionally
define in .cc file. Change all uses Move complex versions of acosh,
asinh, and atanh functions here.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 09 Feb 2016 04:15:50 -0500 |
| parents | f7121e111991 |
| children | b8cf410b5c88 |
line wrap: on
line diff
--- a/liboctave/numeric/lo-mappers.cc Tue Feb 09 03:04:09 2016 -0500 +++ b/liboctave/numeric/lo-mappers.cc Tue Feb 09 04:15:50 2016 -0500 @@ -195,12 +195,6 @@ } Complex -acosh (const Complex& x) -{ - return log (x + sqrt (x + 1.0) * sqrt (x - 1.0)); -} - -Complex asin (const Complex& x) { static Complex i (0, 1); @@ -222,12 +216,6 @@ } Complex -asinh (const Complex& x) -{ - return log (x + sqrt (x*x + 1.0)); -} - -Complex atan (const Complex& x) { static Complex i (0, 1); @@ -235,12 +223,6 @@ return i * log ((i + x) / (i - x)) / 2.0; } -Complex -atanh (const Complex& x) -{ - return log ((1.0 + x) / (1.0 - x)) / 2.0; -} - // complex -> bool mappers. bool @@ -432,12 +414,6 @@ } FloatComplex -acosh (const FloatComplex& x) -{ - return log (x + sqrt (x + 1.0f) * sqrt (x - 1.0f)); -} - -FloatComplex asin (const FloatComplex& x) { static FloatComplex i (0, 1); @@ -459,12 +435,6 @@ } FloatComplex -asinh (const FloatComplex& x) -{ - return log (x + sqrt (x*x + 1.0f)); -} - -FloatComplex atan (const FloatComplex& x) { static FloatComplex i (0, 1); @@ -472,12 +442,6 @@ return i * log ((i + x) / (i - x)) / 2.0f; } -FloatComplex -atanh (const FloatComplex& x) -{ - return log ((1.0f + x) / (1.0f - x)) / 2.0f; -} - // complex -> bool mappers. bool @@ -523,13 +487,13 @@ Complex rc_acosh (double x) { - return x < 1.0 ? acosh (Complex (x)) : Complex (acosh (x)); + return x < 1.0 ? xacosh (Complex (x)) : Complex (xacosh (x)); } FloatComplex rc_acosh (float x) { - return x < 1.0f ? acosh (FloatComplex (x)) : FloatComplex (acoshf (x)); + return x < 1.0f ? xacosh (FloatComplex (x)) : FloatComplex (xacosh (x)); } Complex @@ -547,14 +511,14 @@ Complex rc_atanh (double x) { - return fabs (x) > 1.0 ? atanh (Complex (x)) : Complex (atanh (x)); + return fabs (x) > 1.0 ? xatanh (Complex (x)) : Complex (xatanh (x)); } FloatComplex rc_atanh (float x) { - return fabsf (x) > 1.0f ? atanh (FloatComplex (x)) - : FloatComplex (atanhf (x)); + return fabsf (x) > 1.0f ? xatanh (FloatComplex (x)) + : FloatComplex (xatanh (x)); } Complex