diff options
author | Travis Oliphant <oliphant@enthought.com> | 2006-07-11 21:39:04 +0000 |
---|---|---|
committer | Travis Oliphant <oliphant@enthought.com> | 2006-07-11 21:39:04 +0000 |
commit | a345bd21446141f16f70b8f84c7b42b257b0dcff (patch) | |
tree | 187c250e1e127f14d0ef373af3047cca82602e75 /numpy/core/src/arraymethods.c | |
parent | 107a45f793e249bc87e9bd328fa7d62519a5b4e9 (diff) | |
download | numpy-a345bd21446141f16f70b8f84c7b42b257b0dcff.tar.gz |
Fix .choose docstring and allow more functions to be 'vectorized'
Diffstat (limited to 'numpy/core/src/arraymethods.c')
-rw-r--r-- | numpy/core/src/arraymethods.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/numpy/core/src/arraymethods.c b/numpy/core/src/arraymethods.c index af4a6049e..a4fcc0f47 100644 --- a/numpy/core/src/arraymethods.c +++ b/numpy/core/src/arraymethods.c @@ -670,11 +670,12 @@ array_repeat(PyArrayObject *self, PyObject *args, PyObject *kwds) { } static char doc_choose[] = "a.choose(b0, b1, ..., bn)\n"\ - "\n"\ - "Return an array with elements chosen from 'a' at the positions\n"\ - "of the given arrays b_i. The array 'a' should be an integer array\n"\ - "with entries from 0 to n+1, and the b_i arrays should have the same\n"\ - "shape as 'a'."; + "\n" \ + "Return an array that merges the b_i arrays together using 'a' as the index\n" + "The b_i arrays and 'a' must all be broadcastable to the same shape.\n" + "The output at a particular position is the input array b_i at that position\n" + "depending on the value of 'a' at that position. Therefore, 'a' must be\n" + "an integer array with entries from 0 to n+1."; static PyObject * array_choose(PyArrayObject *self, PyObject *args) |