summaryrefslogtreecommitdiff
path: root/numpy/matrixlib/tests/test_defmatrix.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-08-12 06:28:41 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-08-12 06:28:41 -0700
commitf8efcb6f191621e7c59f5385c85aeaa83be3669d (patch)
treed0029c507a53d4faedc3be104c8f8200eb21e157 /numpy/matrixlib/tests/test_defmatrix.py
parent028007e05fd62d37fc98daf91ae0aafc1ea95cb8 (diff)
parent4d9cd695486fa095c6bff3238341a85cbdb47d0e (diff)
downloadnumpy-f8efcb6f191621e7c59f5385c85aeaa83be3669d.tar.gz
Merge pull request #3360 from juliantaylor/selection-algo
add quickselect algorithm and expose it via partition
Diffstat (limited to 'numpy/matrixlib/tests/test_defmatrix.py')
-rw-r--r--numpy/matrixlib/tests/test_defmatrix.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/matrixlib/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py
index 0cf284b64..7cfcdbe27 100644
--- a/numpy/matrixlib/tests/test_defmatrix.py
+++ b/numpy/matrixlib/tests/test_defmatrix.py
@@ -283,8 +283,9 @@ class TestMatrixReturn(TestCase):
excluded_methods = [
'argmin', 'choose', 'dump', 'dumps', 'fill', 'getfield',
'getA', 'getA1', 'item', 'nonzero', 'put', 'putmask', 'resize',
- 'searchsorted', 'setflags', 'setfield', 'sort', 'take',
- 'tofile', 'tolist', 'tostring', 'all', 'any', 'sum',
+ 'searchsorted', 'setflags', 'setfield', 'sort',
+ 'partition', 'argpartition',
+ 'take', 'tofile', 'tolist', 'tostring', 'all', 'any', 'sum',
'argmax', 'argmin', 'min', 'max', 'mean', 'var', 'ptp',
'prod', 'std', 'ctypes', 'itemset', 'setasflat'
]