diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2005-12-30 23:23:29 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2005-12-30 23:23:29 +0000 |
| commit | 6508583da84bd0c17b492da99c59e091ebb7c049 (patch) | |
| tree | 1f867fa214d771a4ed0549720c1ed64ed64f05ca | |
| parent | 8d90fbf15133b03d75933882c227d808a2598111 (diff) | |
| download | numpy-6508583da84bd0c17b492da99c59e091ebb7c049.tar.gz | |
Updated PyArray_ArgSort to allow future sorting choices.
| -rw-r--r-- | scipy/base/src/arraymethods.c | 2 | ||||
| -rw-r--r-- | scipy/base/src/multiarraymodule.c | 2 | ||||
| -rw-r--r-- | scipy/core_version.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scipy/base/src/arraymethods.c b/scipy/base/src/arraymethods.c index d778dd445..786e116bd 100644 --- a/scipy/base/src/arraymethods.c +++ b/scipy/base/src/arraymethods.c @@ -738,7 +738,7 @@ array_argsort(PyArrayObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "|O&", PyArray_AxisConverter, &axis)) return NULL; - return _ARET(PyArray_ArgSort(self, axis)); + return _ARET(PyArray_ArgSort(self, axis, PyArray_QUICKSORT)); } static char doc_searchsorted[] = "a.searchsorted(v)\n"\ diff --git a/scipy/base/src/multiarraymodule.c b/scipy/base/src/multiarraymodule.c index 8245a73e4..5a4decff8 100644 --- a/scipy/base/src/multiarraymodule.c +++ b/scipy/base/src/multiarraymodule.c @@ -1701,7 +1701,7 @@ argsort_static_compare(const void *ip1, const void *ip2) ArgSort an array */ static PyObject * -PyArray_ArgSort(PyArrayObject *op, int axis) +PyArray_ArgSort(PyArrayObject *op, int axis, PyArray_SORTKIND which) { PyArrayObject *ap, *ret, *store; intp *ip; diff --git a/scipy/core_version.py b/scipy/core_version.py index 3b6994b10..2ab8fbc24 100644 --- a/scipy/core_version.py +++ b/scipy/core_version.py @@ -1,4 +1,4 @@ -version='0.9.0' +version='0.9.1' import os svn_version_file = os.path.join(os.path.dirname(__file__), |