diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-08-10 12:48:04 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-08-10 12:48:04 +0000 |
| commit | c6f48c8a03c438da6e2d400752eff702d1234cfc (patch) | |
| tree | fd032d49f4da991a440e64b462ccc60c3c02de55 /numpy/core/src/arraymethods.c | |
| parent | b772c977e5d4d71c78919ef941858ad438ee4986 (diff) | |
| download | numpy-c6f48c8a03c438da6e2d400752eff702d1234cfc.tar.gz | |
Add output arguments to a few more functions for consistency
Diffstat (limited to 'numpy/core/src/arraymethods.c')
| -rw-r--r-- | numpy/core/src/arraymethods.c | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/numpy/core/src/arraymethods.c b/numpy/core/src/arraymethods.c index 75f0d5b9b..2de6e664f 100644 --- a/numpy/core/src/arraymethods.c +++ b/numpy/core/src/arraymethods.c @@ -156,36 +156,42 @@ array_view(PyArrayObject *self, PyObject *args) return PyArray_View(self, type, NULL); } -static char doc_argmax[] = "a.argmax(axis=None)"; +static char doc_argmax[] = "a.argmax(axis=None, out=None)"; static PyObject * array_argmax(PyArrayObject *self, PyObject *args, PyObject *kwds) { int axis=MAX_DIMS; - static char *kwlist[] = {"axis", NULL}; + PyArrayObject *out=NULL; + static char *kwlist[] = {"axis", "out", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&", kwlist, + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&O&", kwlist, PyArray_AxisConverter, - &axis)) + &axis, + PyArray_OutputConverter, + &out)) return NULL; - return _ARET(PyArray_ArgMax(self, axis)); + return _ARET(PyArray_ArgMax(self, axis, out)); } -static char doc_argmin[] = "a.argmin(axis=None)"; +static char doc_argmin[] = "a.argmin(axis=None, out=None)"; static PyObject * array_argmin(PyArrayObject *self, PyObject *args, PyObject *kwds) { int axis=MAX_DIMS; - static char *kwlist[] = {"axis", NULL}; + PyArrayObject *out=NULL; + static char *kwlist[] = {"axis", "out", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&", kwlist, + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&O&", kwlist, PyArray_AxisConverter, - &axis)) + &axis, + PyArray_OutputConverter, + &out)) return NULL; - return _ARET(PyArray_ArgMin(self, axis)); + return _ARET(PyArray_ArgMin(self, axis, out)); } static char doc_max[] = "a.max(axis=None)"; @@ -1550,19 +1556,22 @@ array_trace(PyArrayObject *self, PyObject *args, PyObject *kwds) #undef _CHKTYPENUM -static char doc_clip[] = "a.clip(min=, max=)"; +static char doc_clip[] = "a.clip(min=, max=, out=None)"; static PyObject * array_clip(PyArrayObject *self, PyObject *args, PyObject *kwds) { PyObject *min, *max; - static char *kwlist[] = {"min", "max", NULL}; + PyArrayObject *out=NULL; + static char *kwlist[] = {"min", "max", "out", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO", kwlist, - &min, &max)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO|O&", kwlist, + &min, &max, + PyArray_OutputConverter, + &out)) return NULL; - return _ARET(PyArray_Clip(self, min, max)); + return _ARET(PyArray_Clip(self, min, max, out)); } static char doc_conj[] = "a.conj()"; @@ -1573,9 +1582,12 @@ static PyObject * array_conjugate(PyArrayObject *self, PyObject *args) { - if (!PyArg_ParseTuple(args, "")) return NULL; + PyArrayObject *out=NULL; + if (!PyArg_ParseTuple(args, "|O&", + PyArray_OutputConverter, + &out)) return NULL; - return PyArray_Conjugate(self); + return PyArray_Conjugate(self, out); } |