diff options
Diffstat (limited to 'scipy/base/src/arraymethods.c')
| -rw-r--r-- | scipy/base/src/arraymethods.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/scipy/base/src/arraymethods.c b/scipy/base/src/arraymethods.c index fa5115a9b..bf929dec2 100644 --- a/scipy/base/src/arraymethods.c +++ b/scipy/base/src/arraymethods.c @@ -1222,7 +1222,24 @@ array_stddev(PyArrayObject *self, PyObject *args, PyObject *kwds) &axis, PyArray_TypecodeConverter, &rtype)) return NULL; - return PyArray_Std(self, axis, rtype.type_num); + return PyArray_Std(self, axis, rtype.type_num, 0); +} + +static char doc_variance[] = "a.var(axis=None, rtype=None)"; + +static PyObject * +array_variance(PyArrayObject *self, PyObject *args, PyObject *kwds) +{ + int axis=MAX_DIMS; + PyArray_Typecode rtype = {PyArray_NOTYPE, 0, 0}; + static char *kwlist[] = {"axis", "rtype", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&O&", kwlist, + PyArray_AxisConverter, + &axis, PyArray_TypecodeConverter, + &rtype)) return NULL; + + return PyArray_Std(self, axis, rtype.type_num, 1); } static char doc_compress[] = "a.compress(condition=, axis=None)"; @@ -1501,6 +1518,8 @@ static PyMethodDef array_methods[] = { METH_VARARGS, doc_nonzero}, {"std", (PyCFunction)array_stddev, METH_VARARGS|METH_KEYWORDS, doc_stddev}, + {"var", (PyCFunction)array_variance, + METH_VARARGS|METH_KEYWORDS, doc_variance}, {"sum", (PyCFunction)array_sum, METH_VARARGS|METH_KEYWORDS, doc_sum}, {"cumsum", (PyCFunction)array_cumsum, |