diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2016-02-20 20:36:02 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2016-02-20 20:36:02 -0700 |
| commit | 81db4853450acc83d9316f2c034bc31be6a3f859 (patch) | |
| tree | 418b2d1df9f5dabbaac22ceb2029fd5034f4bec8 /numpy/core/include | |
| parent | 710ec5667e31e640695c61f04136230f359ea07b (diff) | |
| parent | 542c88b8e10d4d7b9d80b31bb2f971b7e6d4cdb4 (diff) | |
| download | numpy-81db4853450acc83d9316f2c034bc31be6a3f859.tar.gz | |
Merge pull request #7258 from charris/python-compatible-floor_divide
ENH: Make numpy floor_divide and remainder agree with Python `//` and `%`.
Diffstat (limited to 'numpy/core/include')
| -rw-r--r-- | numpy/core/include/numpy/halffloat.h | 1 | ||||
| -rw-r--r-- | numpy/core/include/numpy/npy_math.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/numpy/core/include/numpy/halffloat.h b/numpy/core/include/numpy/halffloat.h index 944f0ea34..ab0d221fb 100644 --- a/numpy/core/include/numpy/halffloat.h +++ b/numpy/core/include/numpy/halffloat.h @@ -37,6 +37,7 @@ int npy_half_signbit(npy_half h); npy_half npy_half_copysign(npy_half x, npy_half y); npy_half npy_half_spacing(npy_half h); npy_half npy_half_nextafter(npy_half x, npy_half y); +npy_half npy_half_divmod(npy_half x, npy_half y, npy_half *modulus); /* * Half-precision constants diff --git a/numpy/core/include/numpy/npy_math.h b/numpy/core/include/numpy/npy_math.h index 3dae583f3..e76508de0 100644 --- a/numpy/core/include/numpy/npy_math.h +++ b/numpy/core/include/numpy/npy_math.h @@ -309,16 +309,20 @@ double npy_deg2rad(double x); double npy_rad2deg(double x); double npy_logaddexp(double x, double y); double npy_logaddexp2(double x, double y); +double npy_divmod(double x, double y, double *modulus); float npy_deg2radf(float x); float npy_rad2degf(float x); float npy_logaddexpf(float x, float y); float npy_logaddexp2f(float x, float y); +float npy_divmodf(float x, float y, float *modulus); npy_longdouble npy_deg2radl(npy_longdouble x); npy_longdouble npy_rad2degl(npy_longdouble x); npy_longdouble npy_logaddexpl(npy_longdouble x, npy_longdouble y); npy_longdouble npy_logaddexp2l(npy_longdouble x, npy_longdouble y); +npy_longdouble npy_divmodl(npy_longdouble x, npy_longdouble y, + npy_longdouble *modulus); #define npy_degrees npy_rad2deg #define npy_degreesf npy_rad2degf |