diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-04-06 11:14:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 11:14:00 +0100 |
| commit | aa746c68d092022df0952e43b29ca4abe092d03b (patch) | |
| tree | 38488b60714bd99330384d1846c03b365991c6a6 /numpy/core/numeric.py | |
| parent | eb12b7106fb2962167627af21bc0bef24f6f650d (diff) | |
| parent | 8427866e4fb038f8d3af317e04a9cc9808bea8ca (diff) | |
| download | numpy-aa746c68d092022df0952e43b29ca4abe092d03b.tar.gz | |
Merge pull request #8890 from sjpet/documentation-issues
DOC: fixes #7622 and #7914
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 632266310..c89b4097a 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -2145,8 +2145,8 @@ def fromfunction(function, shape, **kwargs): The function is called with N parameters, where N is the rank of `shape`. Each parameter represents the coordinates of the array varying along a specific axis. For example, if `shape` - were ``(2, 2)``, then the parameters in turn be (0, 0), (0, 1), - (1, 0), (1, 1). + were ``(2, 2)``, then the parameters would be + ``array([[0, 0], [1, 1]])`` and ``array([[0, 1], [0, 1]])`` shape : (N,) tuple of ints Shape of the output array, which also determines the shape of the coordinate arrays passed to `function`. |