diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-05-16 18:18:44 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-05-16 18:18:44 +0000 |
| commit | b6f1d9f6fbabba198441679ffde7ac651b9fd842 (patch) | |
| tree | 8a3365a2e25afc6dde2550844c0456fa7cccac28 /numpy | |
| parent | 57acda4d624eb9a09c9230c7b8ce0011cffc5ba3 (diff) | |
| download | numpy-b6f1d9f6fbabba198441679ffde7ac651b9fd842.tar.gz | |
Add 'q' to _array_kind and fix argmax which doesn't need to swap back axes.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarraymodule.c | 4 | ||||
| -rw-r--r-- | numpy/linalg/linalg.py | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index 4e323e818..303506eca 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -3054,9 +3054,7 @@ PyArray_ArgMax(PyArrayObject *op, int axis) } Py_DECREF(ap); - SWAPBACK(op, rp); /* op now contains the return */ - - return (PyObject *)op; + return (PyObject *)rp; fail: Py_DECREF(ap); diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py index bd75f9396..35f8d469c 100644 --- a/numpy/linalg/linalg.py +++ b/numpy/linalg/linalg.py @@ -24,8 +24,8 @@ class LinAlgError(Exception): pass # Helper routines -_array_kind = {'i':0, 'l': 0, 'f': 0, 'd': 0, 'F': 1, 'D': 1} -_array_precision = {'i': 1, 'l': 1, 'f': 0, 'd': 1, 'F': 0, 'D': 1} +_array_kind = {'i':0, 'l': 0, 'q': 0, 'f': 0, 'd': 0, 'F': 1, 'D': 1} +_array_precision = {'i': 1, 'l': 1, 'q': 1, 'f': 0, 'd': 1, 'F': 0, 'D': 1} _array_type = [['f', 'd'], ['F', 'D']] def _makearray(a): |