cpython-lru_cache-weakref: Modules/mathmodule.c annotate

annotate Modules/mathmodule.c @ 70303:2d760cb20e1e 2.6

Replay changeset 70249:b571c7a8cf2e from fubar branch. Original commit message: Merging post 2.6.7rc2 changes from Subversion.

author	Barry Warsaw <barry@python.org>
date	Mon, 23 May 2011 15:27:52 -0400
parents	83ca0ea9ef1f
children	b36cb4602e21

rev	line source
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1 /* Math module -- standard C math library functions, pi and e */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	3 /* Here are some comments from Tim Peters, extracted from the
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	4 discussion attached to http://bugs.python.org/issue1640. They
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	5 describe the general aims of the math module with respect to
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	6 special values, IEEE-754 floating-point exceptions, and Python
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	7 exceptions.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	8
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	9 These are the "spirit of 754" rules:
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	10
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	11 1. If the mathematical result is a real number, but of magnitude too
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	12 large to approximate by a machine float, overflow is signaled and the
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	13 result is an infinity (with the appropriate sign).
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	14
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	15 2. If the mathematical result is a real number, but of magnitude too
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	16 small to approximate by a machine float, underflow is signaled and the
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	17 result is a zero (with the appropriate sign).
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	18
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	19 3. At a singularity (a value x such that the limit of f(y) as y
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	20 approaches x exists and is an infinity), "divide by zero" is signaled
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	21 and the result is an infinity (with the appropriate sign). This is
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	22 complicated a little by that the left-side and right-side limits may
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	23 not be the same; e.g., 1/x approaches +inf or -inf as x approaches 0
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	24 from the positive or negative directions. In that specific case, the
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	25 sign of the zero determines the result of 1/0.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	26
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	27 4. At a point where a function has no defined result in the extended
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	28 reals (i.e., the reals plus an infinity or two), invalid operation is
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	29 signaled and a NaN is returned.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	30
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	31 And these are what Python has historically /tried/ to do (but not
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	32 always successfully, as platform libm behavior varies a lot):
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	33
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	34 For #1, raise OverflowError.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	35
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	36 For #2, return a zero (with the appropriate sign if that happens by
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	37 accident ;-)).
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	38
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	39 For #3 and #4, raise ValueError. It may have made sense to raise
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	40 Python's ZeroDivisionError in #3, but historically that's only been
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	41 raised for division by zero and mod by zero.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	42
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	43 */
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	44
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	45 /*
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	46 In general, on an IEEE-754 platform the aim is to follow the C99
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	47 standard, including Annex 'F', whenever possible. Where the
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	48 standard recommends raising the 'divide-by-zero' or 'invalid'
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	49 floating-point exceptions, Python should raise a ValueError. Where
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	50 the standard recommends raising 'overflow', Python should raise an
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	51 OverflowError. In all other circumstances a value should be
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	52 returned.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	53 */
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	54
4635 49745ddb4f69 Renamed Barry Warsaw <barry@python.org> parents: 4503 diff changeset	55 #include "Python.h"
34872 0143d990d60c Make that a C, not a C++, comment. Michael W. Hudson <mwh@python.net> parents: 34871 diff changeset	56 #include "longintrepr.h" /* just for SHIFT */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	57
44940 12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44488 diff changeset	58 #ifdef _OSF_SOURCE
12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44488 diff changeset	59 /* OSF1 5.1 doesn't make this available with XOPEN_SOURCE_EXTENDED defined */
12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44488 diff changeset	60 extern double copysign(double, double);
12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44488 diff changeset	61 #endif
12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44488 diff changeset	62
15170 09c7ac188ce2 Stop raising OverflowError on underflows reported by libm (errno==ERANGE and Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	63 /* Call is_error when errno != 0, and where x is the result libm
09c7ac188ce2 Stop raising OverflowError on underflows reported by libm (errno==ERANGE and Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	64 * returned. is_error will usually set up an exception and return
09c7ac188ce2 Stop raising OverflowError on underflows reported by libm (errno==ERANGE and Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	65 * true (1), but may return false (0) without setting up an exception.
09c7ac188ce2 Stop raising OverflowError on underflows reported by libm (errno==ERANGE and Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	66 */
09c7ac188ce2 Stop raising OverflowError on underflows reported by libm (errno==ERANGE and Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	67 static int
09c7ac188ce2 Stop raising OverflowError on underflows reported by libm (errno==ERANGE and Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	68 is_error(double x)
498 56bb1067a880 Improve error handling. Guido van Rossum <guido@python.org> parents: 438 diff changeset	69 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	70 int result = 1; /* presumption of guilt */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	71 assert(errno); /* non-zero errno is a precondition for calling */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	72 if (errno == EDOM)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	73 PyErr_SetString(PyExc_ValueError, "math domain error");
19750 35b6a1d0b1e0 Rework the way we try to check for libm overflow, given that C99 no longer Tim Peters <tim.peters@gmail.com> parents: 19730 diff changeset	74
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	75 else if (errno == ERANGE) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	76 /* ANSI C generally requires libm functions to set ERANGE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	77 * on overflow, but also generally allows them to set
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	78 * ERANGE on underflow too. There's no consistency about
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	79 * the latter across platforms.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	80 * Alas, C99 never requires that errno be set.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	81 * Here we suppress the underflow errors (libm functions
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	82 * should return a zero on underflow, and +- HUGE_VAL on
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	83 * overflow, so testing the result for zero suffices to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	84 * distinguish the cases).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	85 *
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	86 * On some platforms (Ubuntu/ia64) it seems that errno can be
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	87 * set to ERANGE for subnormal results that do not underflow
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	88 * to zero. So to be safe, we'll ignore ERANGE whenever the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	89 * function result is less than one in absolute value.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	90 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	91 if (fabs(x) < 1.0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	92 result = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	93 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	94 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	95 "math range error");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	96 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	97 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	98 /* Unexpected math error */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	99 PyErr_SetFromErrno(PyExc_ValueError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	100 return result;
498 56bb1067a880 Improve error handling. Guido van Rossum <guido@python.org> parents: 438 diff changeset	101 }
56bb1067a880 Improve error handling. Guido van Rossum <guido@python.org> parents: 438 diff changeset	102
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	103 /*
46507 022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	104 wrapper for atan2 that deals directly with special cases before
022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	105 delegating to the platform libm for the remaining cases. This
022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	106 is necessary to get consistent behaviour across platforms.
022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	107 Windows, FreeBSD and alpha Tru64 are amongst platforms that don't
022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	108 always follow C99.
022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	109 */
022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	110
022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	111 static double
022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	112 m_atan2(double y, double x)
022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	113 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	114 if (Py_IS_NAN(x) \|\| Py_IS_NAN(y))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	115 return Py_NAN;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	116 if (Py_IS_INFINITY(y)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	117 if (Py_IS_INFINITY(x)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	118 if (copysign(1., x) == 1.)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	119 /* atan2(+-inf, +inf) == +-pi/4 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	120 return copysign(0.25*Py_MATH_PI, y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	121 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	122 /* atan2(+-inf, -inf) == +-pi3/4 /
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	123 return copysign(0.75*Py_MATH_PI, y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	124 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	125 /* atan2(+-inf, x) == +-pi/2 for finite x */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	126 return copysign(0.5*Py_MATH_PI, y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	127 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	128 if (Py_IS_INFINITY(x) \|\| y == 0.) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	129 if (copysign(1., x) == 1.)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	130 /* atan2(+-y, +inf) = atan2(+-0, +x) = +-0. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	131 return copysign(0., y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	132 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	133 /* atan2(+-y, -inf) = atan2(+-0., -x) = +-pi. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	134 return copysign(Py_MATH_PI, y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	135 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	136 return atan2(y, x);
46507 022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	137 }
022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	138
022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	139 /*
50122 776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	140 Various platforms (Solaris, OpenBSD) do nonstandard things for log(0),
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	141 log(-ve), log(NaN). Here are wrappers for log and log10 that deal with
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	142 special values directly, passing positive non-special values through to
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	143 the system log/log10.
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	144 */
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	145
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	146 static double
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	147 m_log(double x)
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	148 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	149 if (Py_IS_FINITE(x)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	150 if (x > 0.0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	151 return log(x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	152 errno = EDOM;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	153 if (x == 0.0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	154 return -Py_HUGE_VAL; /* log(0) = -inf */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	155 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	156 return Py_NAN; /* log(-ve) = nan */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	157 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	158 else if (Py_IS_NAN(x))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	159 return x; /* log(nan) = nan */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	160 else if (x > 0.0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	161 return x; /* log(inf) = inf */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	162 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	163 errno = EDOM;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	164 return Py_NAN; /* log(-inf) = nan */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	165 }
50122 776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	166 }
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	167
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	168 static double
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	169 m_log10(double x)
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	170 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	171 if (Py_IS_FINITE(x)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	172 if (x > 0.0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	173 return log10(x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	174 errno = EDOM;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	175 if (x == 0.0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	176 return -Py_HUGE_VAL; /* log10(0) = -inf */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	177 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	178 return Py_NAN; /* log10(-ve) = nan */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	179 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	180 else if (Py_IS_NAN(x))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	181 return x; /* log10(nan) = nan */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	182 else if (x > 0.0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	183 return x; /* log10(inf) = inf */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	184 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	185 errno = EDOM;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	186 return Py_NAN; /* log10(-inf) = nan */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	187 }
50122 776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	188 }
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	189
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	190
776a6cafc21a Merged revisions 67707 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48102 diff changeset	191 /*
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	192 math_1 is used to wrap a libm function f that takes a double
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	193 arguments and returns a double.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	194
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	195 The error reporting follows these rules, which are designed to do
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	196 the right thing on C89/C99 platforms and IEEE 754/non IEEE 754
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	197 platforms.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	198
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	199 - a NaN result from non-NaN inputs causes ValueError to be raised
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	200 - an infinite result from finite inputs causes OverflowError to be
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	201 raised if can_overflow is 1, or raises ValueError if can_overflow
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	202 is 0.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	203 - if the result is finite and errno == EDOM then ValueError is
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	204 raised
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	205 - if the result is finite and nonzero and errno == ERANGE then
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	206 OverflowError is raised
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	207
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	208 The last rule is used to catch overflow on platforms which follow
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	209 C89 but for which HUGE_VAL is not an infinity.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	210
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	211 For the majority of one-argument functions these rules are enough
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	212 to ensure that Python's functions behave as specified in 'Annex F'
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	213 of the C99 standard, with the 'invalid' and 'divide-by-zero'
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	214 floating-point exceptions mapping to Python's ValueError and the
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	215 'overflow' floating-point exception mapping to OverflowError.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	216 math_1 only works for functions that don't have singularities and
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	217 the possibility of overflow; fortunately, that covers everything we
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	218 care about right now.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	219 */
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	220
4635 49745ddb4f69 Renamed Barry Warsaw <barry@python.org> parents: 4503 diff changeset	221 static PyObject *
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	222 math_1(PyObject arg, double (func) (double), int can_overflow)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	223 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	224 double x, r;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	225 x = PyFloat_AsDouble(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	226 if (x == -1.0 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	227 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	228 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	229 PyFPE_START_PROTECT("in math_1", return 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	230 r = (*func)(x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	231 PyFPE_END_PROTECT(r);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	232 if (Py_IS_NAN(r)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	233 if (!Py_IS_NAN(x))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	234 errno = EDOM;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	235 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	236 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	237 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	238 else if (Py_IS_INFINITY(r)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	239 if (Py_IS_FINITE(x))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	240 errno = can_overflow ? ERANGE : EDOM;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	241 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	242 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	243 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	244 if (errno && is_error(r))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	245 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	246 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	247 return PyFloat_FromDouble(r);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	248 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	249
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	250 /*
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	251 math_2 is used to wrap a libm function f that takes two double
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	252 arguments and returns a double.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	253
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	254 The error reporting follows these rules, which are designed to do
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	255 the right thing on C89/C99 platforms and IEEE 754/non IEEE 754
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	256 platforms.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	257
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	258 - a NaN result from non-NaN inputs causes ValueError to be raised
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	259 - an infinite result from finite inputs causes OverflowError to be
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	260 raised.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	261 - if the result is finite and errno == EDOM then ValueError is
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	262 raised
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	263 - if the result is finite and nonzero and errno == ERANGE then
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	264 OverflowError is raised
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	265
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	266 The last rule is used to catch overflow on platforms which follow
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	267 C89 but for which HUGE_VAL is not an infinity.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	268
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	269 For most two-argument functions (copysign, fmod, hypot, atan2)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	270 these rules are enough to ensure that Python's functions behave as
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	271 specified in 'Annex F' of the C99 standard, with the 'invalid' and
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	272 'divide-by-zero' floating-point exceptions mapping to Python's
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	273 ValueError and the 'overflow' floating-point exception mapping to
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	274 OverflowError.
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	275 */
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	276
4635 49745ddb4f69 Renamed Barry Warsaw <barry@python.org> parents: 4503 diff changeset	277 static PyObject *
40362 271133981e63 Speed up function calls into the math module by using METH_O. Neal Norwitz <nnorwitz@gmail.com> parents: 38491 diff changeset	278 math_2(PyObject args, double (func) (double, double), char *funcname)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	279 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	280 PyObject ox, oy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	281 double x, y, r;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	282 if (! PyArg_UnpackTuple(args, funcname, 2, 2, &ox, &oy))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	283 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	284 x = PyFloat_AsDouble(ox);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	285 y = PyFloat_AsDouble(oy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	286 if ((x == -1.0 \|\| y == -1.0) && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	287 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	288 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	289 PyFPE_START_PROTECT("in math_2", return 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	290 r = (*func)(x, y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	291 PyFPE_END_PROTECT(r);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	292 if (Py_IS_NAN(r)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	293 if (!Py_IS_NAN(x) && !Py_IS_NAN(y))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	294 errno = EDOM;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	295 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	296 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	297 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	298 else if (Py_IS_INFINITY(r)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	299 if (Py_IS_FINITE(x) && Py_IS_FINITE(y))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	300 errno = ERANGE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	301 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	302 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	303 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	304 if (errno && is_error(r))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	305 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	306 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	307 return PyFloat_FromDouble(r);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	308 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	309
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	310 #define FUNC1(funcname, func, can_overflow, docstring) \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	311 static PyObject * math_##funcname(PyObject self, PyObject args) { \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	312 return math_1(args, func, can_overflow); \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	313 }\
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	314 PyDoc_STRVAR(math_##funcname##_doc, docstring);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	315
13326 24717405dd89 ANSI-fication, remove Py_PROTO, etc. Fred Drake <fdrake@acm.org> parents: 13309 diff changeset	316 #define FUNC2(funcname, func, docstring) \
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	317 static PyObject * math_##funcname(PyObject self, PyObject args) { \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	318 return math_2(args, func, #funcname); \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	319 }\
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	320 PyDoc_STRVAR(math_##funcname##_doc, docstring);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	321
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	322 FUNC1(acos, acos, 0,
19048 e282d6b2b758 Part of SF patch [#431848] mathmodule.c: doc strings & conversion, from Tim Peters <tim.peters@gmail.com> parents: 18066 diff changeset	323 "acos(x)\n\nReturn the arc cosine (measured in radians) of x.")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	324 FUNC1(acosh, acosh, 0,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	325 "acosh(x)\n\nReturn the hyperbolic arc cosine (measured in radians) of x.")
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	326 FUNC1(asin, asin, 0,
19048 e282d6b2b758 Part of SF patch [#431848] mathmodule.c: doc strings & conversion, from Tim Peters <tim.peters@gmail.com> parents: 18066 diff changeset	327 "asin(x)\n\nReturn the arc sine (measured in radians) of x.")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	328 FUNC1(asinh, asinh, 0,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	329 "asinh(x)\n\nReturn the hyperbolic arc sine (measured in radians) of x.")
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	330 FUNC1(atan, atan, 0,
19048 e282d6b2b758 Part of SF patch [#431848] mathmodule.c: doc strings & conversion, from Tim Peters <tim.peters@gmail.com> parents: 18066 diff changeset	331 "atan(x)\n\nReturn the arc tangent (measured in radians) of x.")
46507 022296032d8f math.atan2 is misbehaving on Windows; this patch Mark Dickinson <dickinsm@gmail.com> parents: 46500 diff changeset	332 FUNC2(atan2, m_atan2,
19048 e282d6b2b758 Part of SF patch [#431848] mathmodule.c: doc strings & conversion, from Tim Peters <tim.peters@gmail.com> parents: 18066 diff changeset	333 "atan2(y, x)\n\nReturn the arc tangent (measured in radians) of y/x.\n"
e282d6b2b758 Part of SF patch [#431848] mathmodule.c: doc strings & conversion, from Tim Peters <tim.peters@gmail.com> parents: 18066 diff changeset	334 "Unlike atan(y/x), the signs of both x and y are considered.")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	335 FUNC1(atanh, atanh, 0,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	336 "atanh(x)\n\nReturn the hyperbolic arc tangent (measured in radians) of x.")
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	337 FUNC1(ceil, ceil, 0,
44488 94eeaeeb3ce9 Continue rolling back pep-3141 changes that changed behavior from 2.5. This Jeffrey Yasskin <jyasskin@gmail.com> parents: 44453 diff changeset	338 "ceil(x)\n\nReturn the ceiling of x as a float.\n"
94eeaeeb3ce9 Continue rolling back pep-3141 changes that changed behavior from 2.5. This Jeffrey Yasskin <jyasskin@gmail.com> parents: 44453 diff changeset	339 "This is the smallest integral value >= x.")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	340 FUNC2(copysign, copysign,
59829 edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	341 "copysign(x, y)\n\nReturn x with the sign of y.")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	342 FUNC1(cos, cos, 0,
19048 e282d6b2b758 Part of SF patch [#431848] mathmodule.c: doc strings & conversion, from Tim Peters <tim.peters@gmail.com> parents: 18066 diff changeset	343 "cos(x)\n\nReturn the cosine of x (measured in radians).")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	344 FUNC1(cosh, cosh, 1,
9593 f22f769bf3d9 Added Doc strings -- by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 9588 diff changeset	345 "cosh(x)\n\nReturn the hyperbolic cosine of x.")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	346 FUNC1(exp, exp, 1,
9593 f22f769bf3d9 Added Doc strings -- by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 9588 diff changeset	347 "exp(x)\n\nReturn e raised to the power of x.")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	348 FUNC1(fabs, fabs, 0,
19048 e282d6b2b758 Part of SF patch [#431848] mathmodule.c: doc strings & conversion, from Tim Peters <tim.peters@gmail.com> parents: 18066 diff changeset	349 "fabs(x)\n\nReturn the absolute value of the float x.")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	350 FUNC1(floor, floor, 0,
44488 94eeaeeb3ce9 Continue rolling back pep-3141 changes that changed behavior from 2.5. This Jeffrey Yasskin <jyasskin@gmail.com> parents: 44453 diff changeset	351 "floor(x)\n\nReturn the floor of x as a float.\n"
94eeaeeb3ce9 Continue rolling back pep-3141 changes that changed behavior from 2.5. This Jeffrey Yasskin <jyasskin@gmail.com> parents: 44453 diff changeset	352 "This is the largest integral value <= x.")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	353 FUNC1(log1p, log1p, 1,
59829 edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	354 "log1p(x)\n\nReturn the natural logarithm of 1+x (base e).\n"
edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	355 "The result is computed in a way which is accurate for x near zero.")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	356 FUNC1(sin, sin, 0,
19048 e282d6b2b758 Part of SF patch [#431848] mathmodule.c: doc strings & conversion, from Tim Peters <tim.peters@gmail.com> parents: 18066 diff changeset	357 "sin(x)\n\nReturn the sine of x (measured in radians).")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	358 FUNC1(sinh, sinh, 1,
9593 f22f769bf3d9 Added Doc strings -- by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 9588 diff changeset	359 "sinh(x)\n\nReturn the hyperbolic sine of x.")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	360 FUNC1(sqrt, sqrt, 0,
9593 f22f769bf3d9 Added Doc strings -- by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 9588 diff changeset	361 "sqrt(x)\n\nReturn the square root of x.")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	362 FUNC1(tan, tan, 0,
19048 e282d6b2b758 Part of SF patch [#431848] mathmodule.c: doc strings & conversion, from Tim Peters <tim.peters@gmail.com> parents: 18066 diff changeset	363 "tan(x)\n\nReturn the tangent of x (measured in radians).")
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	364 FUNC1(tanh, tanh, 0,
9593 f22f769bf3d9 Added Doc strings -- by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 9588 diff changeset	365 "tanh(x)\n\nReturn the hyperbolic tangent of x.")
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	366
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	367 /* Precision summation function as msum() by Raymond Hettinger in
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	368 <http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/393090>,
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	369 enhanced with the exact partials sum and roundoff from Mark
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	370 Dickinson's post at <http://bugs.python.org/file10357/msum4.py>.
47220 71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	371 See those links for more details, proofs and other references.
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	372
47220 71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	373 Note 1: IEEE 754R floating point semantics are assumed,
71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	374 but the current implementation does not re-establish special
71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	375 value semantics across iterations (i.e. handling -Inf + Inf).
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	376
47220 71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	377 Note 2: No provision is made for intermediate overflow handling;
47370 9e6e6b817f32 Fix two typos. Raymond Hettinger <python@rcn.com> parents: 47220 diff changeset	378 therefore, sum([1e+308, 1e-308, 1e+308]) returns 1e+308 while
47220 71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	379 sum([1e+308, 1e+308, 1e-308]) raises an OverflowError due to the
71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	380 overflow of the first partial sum.
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	381
47777 c39263e94c33 Fix comment typos Andrew M. Kuchling <amk@amk.ca> parents: 47757 diff changeset	382 Note 3: The intermediate values lo, yr, and hi are declared volatile so
47783 a7186fee7596 Fix another typo in math_sum comment Mark Dickinson <dickinsm@gmail.com> parents: 47777 diff changeset	383 aggressive compilers won't algebraically reduce lo to always be exactly 0.0.
47532 6cfa297c6555 Unhappy buildbots. Revert 64052. Long doubles have unexpected effects on some builds. Raymond Hettinger <python@rcn.com> parents: 47531 diff changeset	384 Also, the volatile declaration forces the values to be stored in memory as
6cfa297c6555 Unhappy buildbots. Revert 64052. Long doubles have unexpected effects on some builds. Raymond Hettinger <python@rcn.com> parents: 47531 diff changeset	385 regular doubles instead of extended long precision (80-bit) values. This
47777 c39263e94c33 Fix comment typos Andrew M. Kuchling <amk@amk.ca> parents: 47757 diff changeset	386 prevents double rounding because any addition or subtraction of two doubles
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	387 can be resolved exactly into double-sized hi and lo values. As long as the
47532 6cfa297c6555 Unhappy buildbots. Revert 64052. Long doubles have unexpected effects on some builds. Raymond Hettinger <python@rcn.com> parents: 47531 diff changeset	388 hi value gets forced into a double before yr and lo are computed, the extra
6cfa297c6555 Unhappy buildbots. Revert 64052. Long doubles have unexpected effects on some builds. Raymond Hettinger <python@rcn.com> parents: 47531 diff changeset	389 bits in downstream extended precision operations (x87 for example) will be
6cfa297c6555 Unhappy buildbots. Revert 64052. Long doubles have unexpected effects on some builds. Raymond Hettinger <python@rcn.com> parents: 47531 diff changeset	390 exactly zero and therefore can be losslessly stored back into a double,
6cfa297c6555 Unhappy buildbots. Revert 64052. Long doubles have unexpected effects on some builds. Raymond Hettinger <python@rcn.com> parents: 47531 diff changeset	391 thereby preventing double rounding.
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	392
47532 6cfa297c6555 Unhappy buildbots. Revert 64052. Long doubles have unexpected effects on some builds. Raymond Hettinger <python@rcn.com> parents: 47531 diff changeset	393 Note 4: A similar implementation is in Modules/cmathmodule.c.
6cfa297c6555 Unhappy buildbots. Revert 64052. Long doubles have unexpected effects on some builds. Raymond Hettinger <python@rcn.com> parents: 47531 diff changeset	394 Be sure to update both when making changes.
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	395
48102 b35ce954a392 Replace math.sum with math.fsum in a couple of comments Mark Dickinson <dickinsm@gmail.com> parents: 48101 diff changeset	396 Note 5: The signature of math.fsum() differs from __builtin__.sum()
47220 71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	397 because the start argument doesn't make sense in the context of
71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	398 accurate summation. Since the partials table is collapsed before
71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	399 returning a result, sum(seq2, start=sum(seq1)) may not equal the
71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	400 accurate result returned by sum(itertools.chain(seq1, seq2)).
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	401 */
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	402
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	403 #define NUM_PARTIALS 32 /* initial partials array size, on stack */
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	404
47220 71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	405 /* Extend the partials array p[] by doubling its size. */
71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	406 static int /* non-zero on error */
48101 8d05dda735f8 Rename math.sum to math.fsum Mark Dickinson <dickinsm@gmail.com> parents: 48099 diff changeset	407 _fsum_realloc(double **p_ptr, Py_ssize_t n,
47532 6cfa297c6555 Unhappy buildbots. Revert 64052. Long doubles have unexpected effects on some builds. Raymond Hettinger <python@rcn.com> parents: 47531 diff changeset	408 double ps, Py_ssize_t m_ptr)
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	409 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	410 void *v = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	411 Py_ssize_t m = *m_ptr;
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	412
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	413 m += m; /* double */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	414 if (n < m && m < (PY_SSIZE_T_MAX / sizeof(double))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	415 double p = p_ptr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	416 if (p == ps) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	417 v = PyMem_Malloc(sizeof(double) * m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	418 if (v != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	419 memcpy(v, ps, sizeof(double) * n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	420 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	421 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	422 v = PyMem_Realloc(p, sizeof(double) * m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	423 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	424 if (v == NULL) { /* size overflow or no memory */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	425 PyErr_SetString(PyExc_MemoryError, "math.fsum partials");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	426 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	427 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	428 p_ptr = (double) v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	429 *m_ptr = m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	430 return 0;
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	431 }
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	432
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	433 /* Full precision summation of a sequence of floats.
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	434
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	435 def msum(iterable):
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	436 partials = [] # sorted, non-overlapping partial sums
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	437 for x in iterable:
62494 83ca0ea9ef1f Merged revisions 82221 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61465 diff changeset	438 i = 0
83ca0ea9ef1f Merged revisions 82221 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61465 diff changeset	439 for y in partials:
83ca0ea9ef1f Merged revisions 82221 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61465 diff changeset	440 if abs(x) < abs(y):
83ca0ea9ef1f Merged revisions 82221 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61465 diff changeset	441 x, y = y, x
83ca0ea9ef1f Merged revisions 82221 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61465 diff changeset	442 hi = x + y
83ca0ea9ef1f Merged revisions 82221 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61465 diff changeset	443 lo = y - (hi - x)
83ca0ea9ef1f Merged revisions 82221 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61465 diff changeset	444 if lo:
83ca0ea9ef1f Merged revisions 82221 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61465 diff changeset	445 partials[i] = lo
83ca0ea9ef1f Merged revisions 82221 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61465 diff changeset	446 i += 1
83ca0ea9ef1f Merged revisions 82221 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61465 diff changeset	447 x = hi
83ca0ea9ef1f Merged revisions 82221 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61465 diff changeset	448 partials[i:] = [x]
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	449 return sum_exact(partials)
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	450
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	451 Rounded x+y stored in hi with the roundoff stored in lo. Together hi+lo
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	452 are exactly equal to x+y. The inner loop applies hi/lo summation to each
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	453 partial so that the list of partial sums remains exact.
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	454
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	455 Sum_exact() adds the partial sums exactly and correctly rounds the final
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	456 result (using the round-half-to-even rule). The items in partials remain
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	457 non-zero, non-special, non-overlapping and strictly increasing in
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	458 magnitude, but possibly not all having the same sign.
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	459
47220 71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	460 Depends on IEEE 754 arithmetic guarantees and half-even rounding.
71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	461 */
71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	462
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	463 static PyObject*
48101 8d05dda735f8 Rename math.sum to math.fsum Mark Dickinson <dickinsm@gmail.com> parents: 48099 diff changeset	464 math_fsum(PyObject self, PyObject seq)
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	465 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	466 PyObject item, iter, *sum = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	467 Py_ssize_t i, j, n = 0, m = NUM_PARTIALS;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	468 double x, y, t, ps[NUM_PARTIALS], *p = ps;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	469 double xsave, special_sum = 0.0, inf_sum = 0.0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	470 volatile double hi, yr, lo;
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	471
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	472 iter = PyObject_GetIter(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	473 if (iter == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	474 return NULL;
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	475
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	476 PyFPE_START_PROTECT("fsum", Py_DECREF(iter); return NULL)
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	477
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	478 for(;;) { /* for x in iterable */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	479 assert(0 <= n && n <= m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	480 assert((m == NUM_PARTIALS && p == ps) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	481 (m > NUM_PARTIALS && p != NULL));
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	482
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	483 item = PyIter_Next(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	484 if (item == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	485 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	486 goto _fsum_error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	487 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	488 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	489 x = PyFloat_AsDouble(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	490 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	491 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	492 goto _fsum_error;
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	493
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	494 xsave = x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	495 for (i = j = 0; j < n; j++) { /* for y in partials */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	496 y = p[j];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	497 if (fabs(x) < fabs(y)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	498 t = x; x = y; y = t;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	499 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	500 hi = x + y;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	501 yr = hi - x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	502 lo = y - yr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	503 if (lo != 0.0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	504 p[i++] = lo;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	505 x = hi;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	506 }
48099 b40e13bcb9ea Fix special-value handling for math.sum. Mark Dickinson <dickinsm@gmail.com> parents: 47783 diff changeset	507
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	508 n = i; /* ps[i:] = [x] */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	509 if (x != 0.0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	510 if (! Py_IS_FINITE(x)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	511 /* a nonfinite x could arise either as
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	512 a result of intermediate overflow, or
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	513 as a result of a nan or inf in the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	514 summands */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	515 if (Py_IS_FINITE(xsave)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	516 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	517 "intermediate overflow in fsum");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	518 goto _fsum_error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	519 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	520 if (Py_IS_INFINITY(xsave))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	521 inf_sum += xsave;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	522 special_sum += xsave;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	523 /* reset partials */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	524 n = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	525 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	526 else if (n >= m && _fsum_realloc(&p, n, ps, &m))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	527 goto _fsum_error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	528 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	529 p[n++] = x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	530 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	531 }
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	532
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	533 if (special_sum != 0.0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	534 if (Py_IS_NAN(inf_sum))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	535 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	536 "-inf + inf in fsum");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	537 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	538 sum = PyFloat_FromDouble(special_sum);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	539 goto _fsum_error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	540 }
48099 b40e13bcb9ea Fix special-value handling for math.sum. Mark Dickinson <dickinsm@gmail.com> parents: 47783 diff changeset	541
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	542 hi = 0.0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	543 if (n > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	544 hi = p[--n];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	545 /* sum_exact(ps, hi) from the top, stop when the sum becomes
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	546 inexact. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	547 while (n > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	548 x = hi;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	549 y = p[--n];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	550 assert(fabs(y) < fabs(x));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	551 hi = x + y;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	552 yr = hi - x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	553 lo = y - yr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	554 if (lo != 0.0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	555 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	556 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	557 /* Make half-even rounding work across multiple partials.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	558 Needed so that sum([1e-16, 1, 1e16]) will round-up the last
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	559 digit to two instead of down to zero (the 1e-16 makes the 1
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	560 slightly closer to two). With a potential 1 ULP rounding
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	561 error fixed-up, math.fsum() can guarantee commutativity. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	562 if (n > 0 && ((lo < 0.0 && p[n-1] < 0.0) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	563 (lo > 0.0 && p[n-1] > 0.0))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	564 y = lo * 2.0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	565 x = hi + y;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	566 yr = x - hi;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	567 if (y == yr)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	568 hi = x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	569 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	570 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	571 sum = PyFloat_FromDouble(hi);
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	572
48101 8d05dda735f8 Rename math.sum to math.fsum Mark Dickinson <dickinsm@gmail.com> parents: 48099 diff changeset	573 _fsum_error:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	574 PyFPE_END_PROTECT(hi)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	575 Py_DECREF(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	576 if (p != ps)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	577 PyMem_Free(p);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	578 return sum;
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	579 }
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	580
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	581 #undef NUM_PARTIALS
2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	582
48101 8d05dda735f8 Rename math.sum to math.fsum Mark Dickinson <dickinsm@gmail.com> parents: 48099 diff changeset	583 PyDoc_STRVAR(math_fsum_doc,
59829 edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	584 "fsum(iterable)\n\n\
47220 71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	585 Return an accurate floating point sum of values in the iterable.\n\
71deee6b941e Tweak the comments and formatting. Raymond Hettinger <python@rcn.com> parents: 47216 diff changeset	586 Assumes IEEE-754 floating point arithmetic.");
47216 2fffdedb10f8 Issue #2819: Add math.sum, a function that sums a sequence of floats Mark Dickinson <dickinsm@gmail.com> parents: 46797 diff changeset	587
47529 6428c4f1ae09 Issue #2138: Add math.factorial(). Raymond Hettinger <python@rcn.com> parents: 47395 diff changeset	588 static PyObject *
6428c4f1ae09 Issue #2138: Add math.factorial(). Raymond Hettinger <python@rcn.com> parents: 47395 diff changeset	589 math_factorial(PyObject self, PyObject arg)
6428c4f1ae09 Issue #2138: Add math.factorial(). Raymond Hettinger <python@rcn.com> parents: 47395 diff changeset	590 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	591 long i, x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	592 PyObject result, iobj, *newresult;
47529 6428c4f1ae09 Issue #2138: Add math.factorial(). Raymond Hettinger <python@rcn.com> parents: 47395 diff changeset	593
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	594 if (PyFloat_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	595 double dx = PyFloat_AS_DOUBLE((PyFloatObject *)arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	596 if (dx != floor(dx)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	597 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	598 "factorial() only accepts integral values");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	599 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	600 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	601 }
47529 6428c4f1ae09 Issue #2138: Add math.factorial(). Raymond Hettinger <python@rcn.com> parents: 47395 diff changeset	602
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	603 x = PyInt_AsLong(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	604 if (x == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	605 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	606 if (x < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	607 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	608 "factorial() not defined for negative values");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	609 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	610 }
47529 6428c4f1ae09 Issue #2138: Add math.factorial(). Raymond Hettinger <python@rcn.com> parents: 47395 diff changeset	611
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	612 result = (PyObject *)PyInt_FromLong(1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	613 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	614 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	615 for (i=1 ; i<=x ; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	616 iobj = (PyObject *)PyInt_FromLong(i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	617 if (iobj == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	618 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	619 newresult = PyNumber_Multiply(result, iobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	620 Py_DECREF(iobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	621 if (newresult == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	622 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	623 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	624 result = newresult;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	625 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	626 return result;
47529 6428c4f1ae09 Issue #2138: Add math.factorial(). Raymond Hettinger <python@rcn.com> parents: 47395 diff changeset	627
6428c4f1ae09 Issue #2138: Add math.factorial(). Raymond Hettinger <python@rcn.com> parents: 47395 diff changeset	628 error:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	629 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	630 return NULL;
47529 6428c4f1ae09 Issue #2138: Add math.factorial(). Raymond Hettinger <python@rcn.com> parents: 47395 diff changeset	631 }
6428c4f1ae09 Issue #2138: Add math.factorial(). Raymond Hettinger <python@rcn.com> parents: 47395 diff changeset	632
50257 e4675113d10e Merged revisions 67654,67676-67677,67681,67692,67725,67746,67748,67761,67784-67785,67787-67788,67802,67832,67848-67849,67859,67862-67864,67880,67882,67885,67889-67892,67895 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50122 diff changeset	633 PyDoc_STRVAR(math_factorial_doc,
e4675113d10e Merged revisions 67654,67676-67677,67681,67692,67725,67746,67748,67761,67784-67785,67787-67788,67802,67832,67848-67849,67859,67862-67864,67880,67882,67885,67889-67892,67895 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50122 diff changeset	634 "factorial(x) -> Integral\n"
e4675113d10e Merged revisions 67654,67676-67677,67681,67692,67725,67746,67748,67761,67784-67785,67787-67788,67802,67832,67848-67849,67859,67862-67864,67880,67882,67885,67889-67892,67895 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50122 diff changeset	635 "\n"
e4675113d10e Merged revisions 67654,67676-67677,67681,67692,67725,67746,67748,67761,67784-67785,67787-67788,67802,67832,67848-67849,67859,67862-67864,67880,67882,67885,67889-67892,67895 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50122 diff changeset	636 "Find x!. Raise a ValueError if x is negative or non-integral.");
47529 6428c4f1ae09 Issue #2138: Add math.factorial(). Raymond Hettinger <python@rcn.com> parents: 47395 diff changeset	637
4635 49745ddb4f69 Renamed Barry Warsaw <barry@python.org> parents: 4503 diff changeset	638 static PyObject *
45079 492b302aded6 Move __builtins__.trunc() to math.trunc() per Jeffrey Yasskin <jyasskin@gmail.com> parents: 44947 diff changeset	639 math_trunc(PyObject self, PyObject number)
492b302aded6 Move __builtins__.trunc() to math.trunc() per Jeffrey Yasskin <jyasskin@gmail.com> parents: 44947 diff changeset	640 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	641 return PyObject_CallMethod(number, "__trunc__", NULL);
45079 492b302aded6 Move __builtins__.trunc() to math.trunc() per Jeffrey Yasskin <jyasskin@gmail.com> parents: 44947 diff changeset	642 }
492b302aded6 Move __builtins__.trunc() to math.trunc() per Jeffrey Yasskin <jyasskin@gmail.com> parents: 44947 diff changeset	643
492b302aded6 Move __builtins__.trunc() to math.trunc() per Jeffrey Yasskin <jyasskin@gmail.com> parents: 44947 diff changeset	644 PyDoc_STRVAR(math_trunc_doc,
492b302aded6 Move __builtins__.trunc() to math.trunc() per Jeffrey Yasskin <jyasskin@gmail.com> parents: 44947 diff changeset	645 "trunc(x:Real) -> Integral\n"
492b302aded6 Move __builtins__.trunc() to math.trunc() per Jeffrey Yasskin <jyasskin@gmail.com> parents: 44947 diff changeset	646 "\n"
45102 ce9816f53690 Neaten-up a bit. Raymond Hettinger <python@rcn.com> parents: 45079 diff changeset	647 "Truncates x to the nearest Integral toward 0. Uses the __trunc__ magic method.");
45079 492b302aded6 Move __builtins__.trunc() to math.trunc() per Jeffrey Yasskin <jyasskin@gmail.com> parents: 44947 diff changeset	648
492b302aded6 Move __builtins__.trunc() to math.trunc() per Jeffrey Yasskin <jyasskin@gmail.com> parents: 44947 diff changeset	649 static PyObject *
40362 271133981e63 Speed up function calls into the math module by using METH_O. Neal Norwitz <nnorwitz@gmail.com> parents: 38491 diff changeset	650 math_frexp(PyObject self, PyObject arg)
407 9b3d557665a9 Added frexp, ldexp, modf, fmod. Guido van Rossum <guido@python.org> parents: 320 diff changeset	651 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	652 int i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	653 double x = PyFloat_AsDouble(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	654 if (x == -1.0 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	655 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	656 /* deal with special cases directly, to sidestep platform
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	657 differences */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	658 if (Py_IS_NAN(x) \|\| Py_IS_INFINITY(x) \|\| !x) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	659 i = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	660 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	661 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	662 PyFPE_START_PROTECT("in math_frexp", return 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	663 x = frexp(x, &i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	664 PyFPE_END_PROTECT(x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	665 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	666 return Py_BuildValue("(di)", x, i);
407 9b3d557665a9 Added frexp, ldexp, modf, fmod. Guido van Rossum <guido@python.org> parents: 320 diff changeset	667 }
9b3d557665a9 Added frexp, ldexp, modf, fmod. Guido van Rossum <guido@python.org> parents: 320 diff changeset	668
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23427 diff changeset	669 PyDoc_STRVAR(math_frexp_doc,
19712 b4521436e8f8 Mechanical fiddling to make this easier to work with in my editor. Tim Peters <tim.peters@gmail.com> parents: 19048 diff changeset	670 "frexp(x)\n"
b4521436e8f8 Mechanical fiddling to make this easier to work with in my editor. Tim Peters <tim.peters@gmail.com> parents: 19048 diff changeset	671 "\n"
b4521436e8f8 Mechanical fiddling to make this easier to work with in my editor. Tim Peters <tim.peters@gmail.com> parents: 19048 diff changeset	672 "Return the mantissa and exponent of x, as pair (m, e).\n"
b4521436e8f8 Mechanical fiddling to make this easier to work with in my editor. Tim Peters <tim.peters@gmail.com> parents: 19048 diff changeset	673 "m is a float and e is an int, such that x = m * 2.**e.\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23427 diff changeset	674 "If x is 0, m and e are both 0. Else 0.5 <= abs(m) < 1.0.");
9593 f22f769bf3d9 Added Doc strings -- by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 9588 diff changeset	675
4635 49745ddb4f69 Renamed Barry Warsaw <barry@python.org> parents: 4503 diff changeset	676 static PyObject *
13326 24717405dd89 ANSI-fication, remove Py_PROTO, etc. Fred Drake <fdrake@acm.org> parents: 13309 diff changeset	677 math_ldexp(PyObject self, PyObject args)
407 9b3d557665a9 Added frexp, ldexp, modf, fmod. Guido van Rossum <guido@python.org> parents: 320 diff changeset	678 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	679 double x, r;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	680 PyObject *oexp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	681 long exp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	682 if (! PyArg_ParseTuple(args, "dO:ldexp", &x, &oexp))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	683 return NULL;
46797 fd0b894bc90c Issue #2487. math.ldexp(x, n) raised OverflowError when n was large and Mark Dickinson <dickinsm@gmail.com> parents: 46509 diff changeset	684
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	685 if (PyLong_Check(oexp)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	686 /* on overflow, replace exponent with either LONG_MAX
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	687 or LONG_MIN, depending on the sign. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	688 exp = PyLong_AsLong(oexp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	689 if (exp == -1 && PyErr_Occurred()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	690 if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	691 if (Py_SIZE(oexp) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	692 exp = LONG_MIN;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	693 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	694 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	695 exp = LONG_MAX;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	696 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	697 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	698 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	699 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	700 /* propagate any unexpected exception */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	701 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	702 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	703 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	704 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	705 else if (PyInt_Check(oexp)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	706 exp = PyInt_AS_LONG(oexp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	707 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	708 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	709 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	710 "Expected an int or long as second argument "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	711 "to ldexp.");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	712 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	713 }
46797 fd0b894bc90c Issue #2487. math.ldexp(x, n) raised OverflowError when n was large and Mark Dickinson <dickinsm@gmail.com> parents: 46509 diff changeset	714
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	715 if (x == 0. \|\| !Py_IS_FINITE(x)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	716 /* NaNs, zeros and infinities are returned unchanged */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	717 r = x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	718 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	719 } else if (exp > INT_MAX) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	720 /* overflow */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	721 r = copysign(Py_HUGE_VAL, x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	722 errno = ERANGE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	723 } else if (exp < INT_MIN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	724 /* underflow to +-0 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	725 r = copysign(0., x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	726 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	727 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	728 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	729 PyFPE_START_PROTECT("in math_ldexp", return 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	730 r = ldexp(x, (int)exp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	731 PyFPE_END_PROTECT(r);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	732 if (Py_IS_INFINITY(r))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	733 errno = ERANGE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	734 }
46797 fd0b894bc90c Issue #2487. math.ldexp(x, n) raised OverflowError when n was large and Mark Dickinson <dickinsm@gmail.com> parents: 46509 diff changeset	735
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	736 if (errno && is_error(r))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	737 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	738 return PyFloat_FromDouble(r);
407 9b3d557665a9 Added frexp, ldexp, modf, fmod. Guido van Rossum <guido@python.org> parents: 320 diff changeset	739 }
9b3d557665a9 Added frexp, ldexp, modf, fmod. Guido van Rossum <guido@python.org> parents: 320 diff changeset	740
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23427 diff changeset	741 PyDoc_STRVAR(math_ldexp_doc,
59829 edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	742 "ldexp(x, i)\n\n\
edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	743 Return x * (2**i).");
9593 f22f769bf3d9 Added Doc strings -- by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 9588 diff changeset	744
4635 49745ddb4f69 Renamed Barry Warsaw <barry@python.org> parents: 4503 diff changeset	745 static PyObject *
40362 271133981e63 Speed up function calls into the math module by using METH_O. Neal Norwitz <nnorwitz@gmail.com> parents: 38491 diff changeset	746 math_modf(PyObject self, PyObject arg)
407 9b3d557665a9 Added frexp, ldexp, modf, fmod. Guido van Rossum <guido@python.org> parents: 320 diff changeset	747 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	748 double y, x = PyFloat_AsDouble(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	749 if (x == -1.0 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	750 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	751 /* some platforms don't do the right thing for NaNs and
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	752 infinities, so we take care of special cases directly. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	753 if (!Py_IS_FINITE(x)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	754 if (Py_IS_INFINITY(x))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	755 return Py_BuildValue("(dd)", copysign(0., x), x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	756 else if (Py_IS_NAN(x))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	757 return Py_BuildValue("(dd)", x, x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	758 }
46499 80b16595e462 FreeBSD doesn't follow C99 for modf(inf); so add explicit Mark Dickinson <dickinsm@gmail.com> parents: 46490 diff changeset	759
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	760 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	761 PyFPE_START_PROTECT("in math_modf", return 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	762 x = modf(x, &y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	763 PyFPE_END_PROTECT(x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	764 return Py_BuildValue("(dd)", x, y);
407 9b3d557665a9 Added frexp, ldexp, modf, fmod. Guido van Rossum <guido@python.org> parents: 320 diff changeset	765 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	766
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23427 diff changeset	767 PyDoc_STRVAR(math_modf_doc,
19712 b4521436e8f8 Mechanical fiddling to make this easier to work with in my editor. Tim Peters <tim.peters@gmail.com> parents: 19048 diff changeset	768 "modf(x)\n"
b4521436e8f8 Mechanical fiddling to make this easier to work with in my editor. Tim Peters <tim.peters@gmail.com> parents: 19048 diff changeset	769 "\n"
b4521436e8f8 Mechanical fiddling to make this easier to work with in my editor. Tim Peters <tim.peters@gmail.com> parents: 19048 diff changeset	770 "Return the fractional and integer parts of x. Both results carry the sign\n"
50257 e4675113d10e Merged revisions 67654,67676-67677,67681,67692,67725,67746,67748,67761,67784-67785,67787-67788,67802,67832,67848-67849,67859,67862-67864,67880,67882,67885,67889-67892,67895 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50122 diff changeset	771 "of x and are floats.");
9593 f22f769bf3d9 Added Doc strings -- by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 9588 diff changeset	772
19713 9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	773 /* A decent logarithm is easy to compute even for huge longs, but libm can't
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	774 do that by itself -- loghelper can. func is log or log10, and name is
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	775 "log" or "log10". Note that overflow isn't possible: a long can contain
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	776 no more than INT_MAX * SHIFT bits, so has value certainly less than
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	777 2(264 * 216) == 2280, and log2 of that is 280, which is
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	778 small enough to fit in an IEEE single. log and log10 are even smaller.
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	779 */
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	780
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	781 static PyObject*
40362 271133981e63 Speed up function calls into the math module by using METH_O. Neal Norwitz <nnorwitz@gmail.com> parents: 38491 diff changeset	782 loghelper(PyObject* arg, double (func)(double), char funcname)
19713 9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	783 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	784 /* If it is long, do it ourselves. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	785 if (PyLong_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	786 double x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	787 int e;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	788 x = _PyLong_AsScaledDouble(arg, &e);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	789 if (x <= 0.0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	790 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	791 "math domain error");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	792 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	793 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	794 /* Value is ~= x * 2*(ePyLong_SHIFT), so the log ~=
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	795 log(x) + log(2) * e * PyLong_SHIFT.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	796 CAUTION: e*PyLong_SHIFT may overflow using int arithmetic,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	797 so force use of double. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	798 x = func(x) + (e * (double)PyLong_SHIFT) * func(2.0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	799 return PyFloat_FromDouble(x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	800 }
19713 9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	801
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	802 /* Else let libm handle it by itself. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	803 return math_1(arg, func, 0);
19713 9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	804 }
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	805
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	806 static PyObject *
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	807 math_log(PyObject self, PyObject args)
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	808 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	809 PyObject *arg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	810 PyObject *base = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	811 PyObject num, den;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	812 PyObject *ans;
26661 b12e326b4ea2 Apply SF patch 652930: Add optional base argument to math.log(x[, base]). Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	813
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	814 if (!PyArg_UnpackTuple(args, "log", 1, 2, &arg, &base))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	815 return NULL;
26661 b12e326b4ea2 Apply SF patch 652930: Add optional base argument to math.log(x[, base]). Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	816
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	817 num = loghelper(arg, m_log, "log");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	818 if (num == NULL \|\| base == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	819 return num;
26661 b12e326b4ea2 Apply SF patch 652930: Add optional base argument to math.log(x[, base]). Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	820
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	821 den = loghelper(base, m_log, "log");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	822 if (den == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	823 Py_DECREF(num);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	824 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	825 }
26661 b12e326b4ea2 Apply SF patch 652930: Add optional base argument to math.log(x[, base]). Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	826
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	827 ans = PyNumber_Divide(num, den);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	828 Py_DECREF(num);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	829 Py_DECREF(den);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	830 return ans;
19713 9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	831 }
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	832
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23427 diff changeset	833 PyDoc_STRVAR(math_log_doc,
59829 edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	834 "log(x[, base])\n\n\
edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	835 Return the logarithm of x to the given base.\n\
26661 b12e326b4ea2 Apply SF patch 652930: Add optional base argument to math.log(x[, base]). Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	836 If the base not specified, returns the natural logarithm (base e) of x.");
19713 9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	837
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	838 static PyObject *
40362 271133981e63 Speed up function calls into the math module by using METH_O. Neal Norwitz <nnorwitz@gmail.com> parents: 38491 diff changeset	839 math_log10(PyObject self, PyObject arg)
19713 9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	840 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	841 return loghelper(arg, m_log10, "log10");
19713 9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	842 }
9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	843
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23427 diff changeset	844 PyDoc_STRVAR(math_log10_doc,
59829 edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	845 "log10(x)\n\nReturn the base 10 logarithm of x.");
19713 9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	846
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	847 static PyObject *
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	848 math_fmod(PyObject self, PyObject args)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	849 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	850 PyObject ox, oy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	851 double r, x, y;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	852 if (! PyArg_UnpackTuple(args, "fmod", 2, 2, &ox, &oy))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	853 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	854 x = PyFloat_AsDouble(ox);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	855 y = PyFloat_AsDouble(oy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	856 if ((x == -1.0 \|\| y == -1.0) && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	857 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	858 /* fmod(x, +/-Inf) returns x for finite x. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	859 if (Py_IS_INFINITY(y) && Py_IS_FINITE(x))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	860 return PyFloat_FromDouble(x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	861 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	862 PyFPE_START_PROTECT("in math_fmod", return 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	863 r = fmod(x, y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	864 PyFPE_END_PROTECT(r);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	865 if (Py_IS_NAN(r)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	866 if (!Py_IS_NAN(x) && !Py_IS_NAN(y))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	867 errno = EDOM;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	868 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	869 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	870 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	871 if (errno && is_error(r))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	872 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	873 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	874 return PyFloat_FromDouble(r);
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	875 }
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	876
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	877 PyDoc_STRVAR(math_fmod_doc,
59829 edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	878 "fmod(x, y)\n\nReturn fmod(x, y), according to platform C."
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	879 " x % y may differ.");
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	880
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	881 static PyObject *
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	882 math_hypot(PyObject self, PyObject args)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	883 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	884 PyObject ox, oy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	885 double r, x, y;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	886 if (! PyArg_UnpackTuple(args, "hypot", 2, 2, &ox, &oy))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	887 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	888 x = PyFloat_AsDouble(ox);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	889 y = PyFloat_AsDouble(oy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	890 if ((x == -1.0 \|\| y == -1.0) && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	891 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	892 /* hypot(x, +/-Inf) returns Inf, even if x is a NaN. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	893 if (Py_IS_INFINITY(x))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	894 return PyFloat_FromDouble(fabs(x));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	895 if (Py_IS_INFINITY(y))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	896 return PyFloat_FromDouble(fabs(y));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	897 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	898 PyFPE_START_PROTECT("in math_hypot", return 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	899 r = hypot(x, y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	900 PyFPE_END_PROTECT(r);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	901 if (Py_IS_NAN(r)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	902 if (!Py_IS_NAN(x) && !Py_IS_NAN(y))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	903 errno = EDOM;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	904 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	905 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	906 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	907 else if (Py_IS_INFINITY(r)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	908 if (Py_IS_FINITE(x) && Py_IS_FINITE(y))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	909 errno = ERANGE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	910 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	911 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	912 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	913 if (errno && is_error(r))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	914 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	915 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	916 return PyFloat_FromDouble(r);
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	917 }
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	918
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	919 PyDoc_STRVAR(math_hypot_doc,
59829 edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	920 "hypot(x, y)\n\nReturn the Euclidean distance, sqrt(xx + yy).");
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	921
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	922 /* pow can't use math_2, but needs its own wrapper: the problem is
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	923 that an infinite result can arise either as a result of overflow
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	924 (in which case OverflowError should be raised) or as a result of
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	925 e.g. 0.**-5. (for which ValueError needs to be raised.)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	926 */
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	927
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	928 static PyObject *
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	929 math_pow(PyObject self, PyObject args)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	930 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	931 PyObject ox, oy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	932 double r, x, y;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	933 int odd_y;
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	934
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	935 if (! PyArg_UnpackTuple(args, "pow", 2, 2, &ox, &oy))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	936 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	937 x = PyFloat_AsDouble(ox);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	938 y = PyFloat_AsDouble(oy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	939 if ((x == -1.0 \|\| y == -1.0) && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	940 return NULL;
46490 648b4d01cccf Additional special-case handling for math.pow. Mark Dickinson <dickinsm@gmail.com> parents: 46486 diff changeset	941
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	942 /* deal directly with IEEE specials, to cope with problems on various
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	943 platforms whose semantics don't exactly match C99 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	944 r = 0.; /* silence compiler warning */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	945 if (!Py_IS_FINITE(x) \|\| !Py_IS_FINITE(y)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	946 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	947 if (Py_IS_NAN(x))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	948 r = y == 0. ? 1. : x; /* NaN*0 = 1 /
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	949 else if (Py_IS_NAN(y))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	950 r = x == 1. ? 1. : y; /* 1*NaN = 1 /
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	951 else if (Py_IS_INFINITY(x)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	952 odd_y = Py_IS_FINITE(y) && fmod(fabs(y), 2.0) == 1.0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	953 if (y > 0.)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	954 r = odd_y ? x : fabs(x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	955 else if (y == 0.)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	956 r = 1.;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	957 else /* y < 0. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	958 r = odd_y ? copysign(0., x) : 0.;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	959 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	960 else if (Py_IS_INFINITY(y)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	961 if (fabs(x) == 1.0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	962 r = 1.;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	963 else if (y > 0. && fabs(x) > 1.0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	964 r = y;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	965 else if (y < 0. && fabs(x) < 1.0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	966 r = -y; /* result is +inf */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	967 if (x == 0.) /* 0*-inf: divide-by-zero /
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	968 errno = EDOM;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	969 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	970 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	971 r = 0.;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	972 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	973 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	974 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	975 /* let libm handle finite*finite /
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	976 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	977 PyFPE_START_PROTECT("in math_pow", return 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	978 r = pow(x, y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	979 PyFPE_END_PROTECT(r);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	980 /* a NaN result should arise only from (-ve)**(finite
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	981 non-integer); in this case we want to raise ValueError. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	982 if (!Py_IS_FINITE(r)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	983 if (Py_IS_NAN(r)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	984 errno = EDOM;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	985 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	986 /*
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	987 an infinite result here arises either from:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	988 (A) (+/-0.)**negative (-> divide-by-zero)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	989 (B) overflow of x**y with x and y finite
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	990 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	991 else if (Py_IS_INFINITY(r)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	992 if (x == 0.)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	993 errno = EDOM;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	994 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	995 errno = ERANGE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	996 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	997 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	998 }
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	999
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1000 if (errno && is_error(r))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1001 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1002 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1003 return PyFloat_FromDouble(r);
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	1004 }
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	1005
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	1006 PyDoc_STRVAR(math_pow_doc,
59829 edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	1007 "pow(x, y)\n\nReturn x**y (x to the power of y).");
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	1008
44437 968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1009 static const double degToRad = Py_MATH_PI / 180.0;
968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1010 static const double radToDeg = 180.0 / Py_MATH_PI;
23427 a4d675b8b53c Added degrees() and radians() to mathmodule. Closes patch 552452 and Raymond Hettinger <python@rcn.com> parents: 19758 diff changeset	1011
a4d675b8b53c Added degrees() and radians() to mathmodule. Closes patch 552452 and Raymond Hettinger <python@rcn.com> parents: 19758 diff changeset	1012 static PyObject *
40362 271133981e63 Speed up function calls into the math module by using METH_O. Neal Norwitz <nnorwitz@gmail.com> parents: 38491 diff changeset	1013 math_degrees(PyObject self, PyObject arg)
23427 a4d675b8b53c Added degrees() and radians() to mathmodule. Closes patch 552452 and Raymond Hettinger <python@rcn.com> parents: 19758 diff changeset	1014 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1015 double x = PyFloat_AsDouble(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1016 if (x == -1.0 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1017 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1018 return PyFloat_FromDouble(x * radToDeg);
23427 a4d675b8b53c Added degrees() and radians() to mathmodule. Closes patch 552452 and Raymond Hettinger <python@rcn.com> parents: 19758 diff changeset	1019 }
a4d675b8b53c Added degrees() and radians() to mathmodule. Closes patch 552452 and Raymond Hettinger <python@rcn.com> parents: 19758 diff changeset	1020
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23427 diff changeset	1021 PyDoc_STRVAR(math_degrees_doc,
59829 edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	1022 "degrees(x)\n\n\
edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	1023 Convert angle x from radians to degrees.");
23427 a4d675b8b53c Added degrees() and radians() to mathmodule. Closes patch 552452 and Raymond Hettinger <python@rcn.com> parents: 19758 diff changeset	1024
a4d675b8b53c Added degrees() and radians() to mathmodule. Closes patch 552452 and Raymond Hettinger <python@rcn.com> parents: 19758 diff changeset	1025 static PyObject *
40362 271133981e63 Speed up function calls into the math module by using METH_O. Neal Norwitz <nnorwitz@gmail.com> parents: 38491 diff changeset	1026 math_radians(PyObject self, PyObject arg)
23427 a4d675b8b53c Added degrees() and radians() to mathmodule. Closes patch 552452 and Raymond Hettinger <python@rcn.com> parents: 19758 diff changeset	1027 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1028 double x = PyFloat_AsDouble(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1029 if (x == -1.0 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1030 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1031 return PyFloat_FromDouble(x * degToRad);
23427 a4d675b8b53c Added degrees() and radians() to mathmodule. Closes patch 552452 and Raymond Hettinger <python@rcn.com> parents: 19758 diff changeset	1032 }
a4d675b8b53c Added degrees() and radians() to mathmodule. Closes patch 552452 and Raymond Hettinger <python@rcn.com> parents: 19758 diff changeset	1033
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23427 diff changeset	1034 PyDoc_STRVAR(math_radians_doc,
59829 edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	1035 "radians(x)\n\n\
edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	1036 Convert angle x from degrees to radians.");
19713 9433dd3c197e Return reasonable results for math.log(long) and math.log10(long) (we were Tim Peters <tim.peters@gmail.com> parents: 19712 diff changeset	1037
44437 968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1038 static PyObject *
968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1039 math_isnan(PyObject self, PyObject arg)
968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1040 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1041 double x = PyFloat_AsDouble(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1042 if (x == -1.0 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1043 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1044 return PyBool_FromLong((long)Py_IS_NAN(x));
44437 968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1045 }
968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1046
968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1047 PyDoc_STRVAR(math_isnan_doc,
59829 edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	1048 "isnan(x) -> bool\n\n\
edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	1049 Check if float x is not a number (NaN).");
44437 968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1050
968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1051 static PyObject *
968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1052 math_isinf(PyObject self, PyObject arg)
968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1053 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1054 double x = PyFloat_AsDouble(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1055 if (x == -1.0 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1056 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1057 return PyBool_FromLong((long)Py_IS_INFINITY(x));
44437 968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1058 }
968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1059
968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1060 PyDoc_STRVAR(math_isinf_doc,
59829 edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	1061 "isinf(x) -> bool\n\n\
edc92bce4d6e Merged revisions 75952-75953,75955,76105,76143,76223,76259,76326,76376-76377 via svnmerge from Georg Brandl <georg@python.org> parents: 50257 diff changeset	1062 Check if float x is infinite (positive or negative).");
44437 968bda81e6c8 Added math.isinf() and math.isnan() Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	1063
4635 49745ddb4f69 Renamed Barry Warsaw <barry@python.org> parents: 4503 diff changeset	1064 static PyMethodDef math_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1065 {"acos", math_acos, METH_O, math_acos_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1066 {"acosh", math_acosh, METH_O, math_acosh_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1067 {"asin", math_asin, METH_O, math_asin_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1068 {"asinh", math_asinh, METH_O, math_asinh_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1069 {"atan", math_atan, METH_O, math_atan_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1070 {"atan2", math_atan2, METH_VARARGS, math_atan2_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1071 {"atanh", math_atanh, METH_O, math_atanh_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1072 {"ceil", math_ceil, METH_O, math_ceil_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1073 {"copysign", math_copysign, METH_VARARGS, math_copysign_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1074 {"cos", math_cos, METH_O, math_cos_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1075 {"cosh", math_cosh, METH_O, math_cosh_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1076 {"degrees", math_degrees, METH_O, math_degrees_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1077 {"exp", math_exp, METH_O, math_exp_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1078 {"fabs", math_fabs, METH_O, math_fabs_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1079 {"factorial", math_factorial, METH_O, math_factorial_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1080 {"floor", math_floor, METH_O, math_floor_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1081 {"fmod", math_fmod, METH_VARARGS, math_fmod_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1082 {"frexp", math_frexp, METH_O, math_frexp_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1083 {"fsum", math_fsum, METH_O, math_fsum_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1084 {"hypot", math_hypot, METH_VARARGS, math_hypot_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1085 {"isinf", math_isinf, METH_O, math_isinf_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1086 {"isnan", math_isnan, METH_O, math_isnan_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1087 {"ldexp", math_ldexp, METH_VARARGS, math_ldexp_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1088 {"log", math_log, METH_VARARGS, math_log_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1089 {"log1p", math_log1p, METH_O, math_log1p_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1090 {"log10", math_log10, METH_O, math_log10_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1091 {"modf", math_modf, METH_O, math_modf_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1092 {"pow", math_pow, METH_VARARGS, math_pow_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1093 {"radians", math_radians, METH_O, math_radians_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1094 {"sin", math_sin, METH_O, math_sin_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1095 {"sinh", math_sinh, METH_O, math_sinh_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1096 {"sqrt", math_sqrt, METH_O, math_sqrt_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1097 {"tan", math_tan, METH_O, math_tan_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1098 {"tanh", math_tanh, METH_O, math_tanh_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1099 {"trunc", math_trunc, METH_O, math_trunc_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1100 {NULL, NULL} /* sentinel */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1101 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1102
9593 f22f769bf3d9 Added Doc strings -- by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 9588 diff changeset	1103
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23427 diff changeset	1104 PyDoc_STRVAR(module_doc,
19712 b4521436e8f8 Mechanical fiddling to make this easier to work with in my editor. Tim Peters <tim.peters@gmail.com> parents: 19048 diff changeset	1105 "This module is always available. It provides access to the\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23427 diff changeset	1106 "mathematical functions defined by the C standard.");
9593 f22f769bf3d9 Added Doc strings -- by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 9588 diff changeset	1107
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 23832 diff changeset	1108 PyMODINIT_FUNC
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13331 diff changeset	1109 initmath(void)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1110 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1111 PyObject *m;
19048 e282d6b2b758 Part of SF patch [#431848] mathmodule.c: doc strings & conversion, from Tim Peters <tim.peters@gmail.com> parents: 18066 diff changeset	1112
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1113 m = Py_InitModule3("math", math_methods, module_doc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1114 if (m == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1115 goto finally;
4752 7367fb107108 Better error checking in initmath(). Barry Warsaw <barry@python.org> parents: 4635 diff changeset	1116
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1117 PyModule_AddObject(m, "pi", PyFloat_FromDouble(Py_MATH_PI));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1118 PyModule_AddObject(m, "e", PyFloat_FromDouble(Py_MATH_E));
4752 7367fb107108 Better error checking in initmath(). Barry Warsaw <barry@python.org> parents: 4635 diff changeset	1119
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 45102 diff changeset	1120 finally:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59829 diff changeset	1121 return;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1122 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/mathmodule.c @ 70303:2d760cb20e1e 2.6