Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
129fe04d
Commit
129fe04d
authored
May 08, 2016
by
Martin Panter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #26512: Clarify Integral; tidy up table of rounding functions
Based on patch by Julien.
parent
ad1fd346
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
17 deletions
+20
-17
Doc/library/stdtypes.rst
Doc/library/stdtypes.rst
+16
-13
Modules/mathmodule.c
Modules/mathmodule.c
+4
-4
No files found.
Doc/library/stdtypes.rst
View file @
129fe04d
...
...
@@ -361,19 +361,22 @@ Notes:
All :class:`numbers.Real` types (:class:`int` and :class:`float`) also include
the following operations:
+--------------------+------------------------------------+--------+
| Operation | Result | Notes |
+====================+====================================+========+
| ``math.trunc(x)`` | *x* truncated to Integral | |
+--------------------+------------------------------------+--------+
| ``round(x[, n])`` | *x* rounded to n digits, | |
| | rounding half to even. If n is | |
| | omitted, it defaults to 0. | |
+--------------------+------------------------------------+--------+
| ``math.floor(x)`` | the greatest integral float <= *x* | |
+--------------------+------------------------------------+--------+
| ``math.ceil(x)`` | the least integral float >= *x* | |
+--------------------+------------------------------------+--------+
+--------------------+---------------------------------------------+
| Operation | Result |
+====================+=============================================+
| :func:`math.trunc(\| *x* truncated to :class:`~numbers.Integral` |
| x) <math.trunc>` | |
+--------------------+---------------------------------------------+
| :func:`round(x[, | *x* rounded to *n* digits, |
| n]) <round>` | rounding half to even. If *n* is |
| | omitted, it defaults to 0. |
+--------------------+---------------------------------------------+
| :func:`math.floor(\| the greatest :class:`~numbers.Integral` |
| x) <math.floor>` | <= *x* |
+--------------------+---------------------------------------------+
| :func:`math.ceil(x)| the least :class:`~numbers.Integral` >= *x* |
| <math.ceil>` | |
+--------------------+---------------------------------------------+
For additional numeric operations see the :mod:`math` and :mod:`cmath`
modules.
...
...
Modules/mathmodule.c
View file @
129fe04d
...
...
@@ -957,8 +957,8 @@ static PyObject * math_ceil(PyObject *self, PyObject *number) {
}
PyDoc_STRVAR
(
math_ceil_doc
,
"ceil(x)
\n\n
Return the ceiling of x as an
int
.
\n
"
"This is the smallest integ
ral value
>= x."
);
"ceil(x)
\n\n
Return the ceiling of x as an
Integral
.
\n
"
"This is the smallest integ
er
>= x."
);
FUNC2
(
copysign
,
copysign
,
"copysign(x, y)
\n\n
Return a float with the magnitude (absolute value) "
...
...
@@ -997,8 +997,8 @@ static PyObject * math_floor(PyObject *self, PyObject *number) {
}
PyDoc_STRVAR
(
math_floor_doc
,
"floor(x)
\n\n
Return the floor of x as an
int
.
\n
"
"This is the largest integ
ral value
<= x."
);
"floor(x)
\n\n
Return the floor of x as an
Integral
.
\n
"
"This is the largest integ
er
<= x."
);
FUNC1A
(
gamma
,
m_tgamma
,
"gamma(x)
\n\n
Gamma function at x."
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment