Thanks to visit codestin.com
Credit goes to github.com

Skip to content

BUG: Simplified fix, Overflow in tan and tanh for large complex values. #5518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charris merged 7 commits into from
Feb 13, 2015
Merged

BUG: Simplified fix, Overflow in tan and tanh for large complex values. #5518

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de681b7
ENH: Detect all functions in complex.h
charris Jan 28, 2015
c1f7e0b
ENH: Implement more fallback complex functions for npy_math.
ewmoore Jan 28, 2015
6906823
ENH: Use the new complex functions in npymath for our ufuncs.
ewmoore Jan 28, 2015
34b5f9f
TST: Add tests for complex ufuncs.
ewmoore Jan 29, 2015
44d0c52
BUG: Do not use system cpow directly.
charris Jan 29, 2015
3a4127b
BUG: Disable broken complex trig functions for early linux glibc.
charris Jan 30, 2015
f9c3776
DOC: Document changes in npymath library.
charris Feb 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
BUG: Do not use system cpow directly. 
Numpy computes small integer powers by multiplication, this leads to
different results than the system cpow for such integers. In particular,
cpow((0 + inf*1j), 2) returns (-inf + 0j) rather than (-inf + nanj). The
system version probably makes more sense, but better to keep
compatibility at this point. We could fix our results using cproj.
  • Loading branch information
@charris
charris committed Feb 13, 2015
commit 44d0c52ccd3de10874154bbe1ceab6ddade0afca
61 changes: 36 additions & 25 deletions numpy/core/src/npymath/npy_math_complex.c.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "npy_math_common.h"
#include "npy_math_private.h"


#define raise_inexact() do { volatile npy_float junk = 1 + tiny; } while(0)


Expand Down Expand Up @@ -431,7 +432,27 @@ npy_csqrt@c@(@ctype@ z)
#undef THRESH
#endif

#ifndef HAVE_CPOW@C@
/*
* Always use this function because of the multiplication for small
* integer powers, but in the body use cpow if it is available.
*/

/* private function for use in npy_pow{f, ,l} */
#ifdef HAVE_CPOW@C@
static @ctype@
sys_cpow@c@(@ctype@ x, @ctype@ y)
{
__@ctype@_to_c99_cast xcast;
__@ctype@_to_c99_cast ycast;
__@ctype@_to_c99_cast ret;
xcast.npy_z = x;
ycast.npy_z = y;
ret.c99_z = cpow@c@(xcast.c99_z, ycast.c99_z);
return ret.npy_z;
}
#endif


@ctype@
npy_cpow@c@ (@ctype@ a, @ctype@ b)
{
Expand All @@ -440,7 +461,7 @@ npy_cpow@c@ (@ctype@ a, @ctype@ b)
@type@ br = npy_creal@c@(b);
@type@ ai = npy_cimag@c@(a);
@type@ bi = npy_cimag@c@(b);
@ctype@ loga, r;
@ctype@ r;

if (br == 0. && bi == 0.) {
return npy_cpack@c@(1., 0.);
Expand Down Expand Up @@ -505,13 +526,21 @@ npy_cpow@c@ (@ctype@ a, @ctype@ b)
}
}

loga = npy_clog@c@(a);
ar = npy_creal@c@(loga);
ai = npy_cimag@c@(loga);
#ifdef HAVE_CPOW@C@
return sys_cpow@c@(a, b);

#else
{
@ctype@ loga = npy_clog@c@(a);

ar = npy_creal@c@(loga);
ai = npy_cimag@c@(loga);
return npy_cexp@c@(npy_cpack@c@(ar*br - ai*bi, ar*bi + ai*br));
}

return npy_cexp@c@(npy_cpack@c@(ar * br - ai * bi, ar * bi + ai * br));
}
#endif
}


#ifndef HAVE_CCOS@C@
@ctype@
Expand Down Expand Up @@ -1753,23 +1782,5 @@ npy_@kind@@c@(@ctype@ z)
#endif
/**end repeat1**/

/**begin repeat1
* #kind = cpow#
* #KIND = CPOW#
*/
#ifdef HAVE_@KIND@@C@
@ctype@
npy_@kind@@c@(@ctype@ x, @ctype@ y)
{
__@ctype@_to_c99_cast xcast;
__@ctype@_to_c99_cast ycast;
__@ctype@_to_c99_cast ret;
xcast.npy_z = x;
ycast.npy_z = y;
ret.c99_z = @kind@@c@(xcast.c99_z, ycast.c99_z);
return ret.npy_z;
}
#endif
/**end repeat1**/

/**end repeat**/