summaryrefslogtreecommitdiff
path: root/numpy/linalg
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/linalg')
-rw-r--r--numpy/linalg/linalg.py4
-rw-r--r--numpy/linalg/tests/test_linalg.py10
2 files changed, 5 insertions, 9 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py
index 7eac95248..45e12f1a3 100644
--- a/numpy/linalg/linalg.py
+++ b/numpy/linalg/linalg.py
@@ -931,7 +931,7 @@ def eigvalsh(a, UPLO='L'):
Returns
-------
w : (..., M,) ndarray
- The eigenvalues, not necessarily ordered, each repeated according to
+ The eigenvalues in ascending order, each repeated according to
its multiplicity.
Raises
@@ -960,7 +960,7 @@ def eigvalsh(a, UPLO='L'):
>>> from numpy import linalg as LA
>>> a = np.array([[1, -2j], [2j, 5]])
>>> LA.eigvalsh(a)
- array([ 0.17157288+0.j, 5.82842712+0.j])
+ array([ 0.17157288, 5.82842712])
"""
UPLO = UPLO.upper()
diff --git a/numpy/linalg/tests/test_linalg.py b/numpy/linalg/tests/test_linalg.py
index ca59aa566..c6d84706a 100644
--- a/numpy/linalg/tests/test_linalg.py
+++ b/numpy/linalg/tests/test_linalg.py
@@ -686,19 +686,15 @@ class TestBoolPower(object):
class TestEigvalsh(HermitianTestCase, HermitianGeneralizedTestCase):
def do(self, a, b):
- # note that eigenvalue arrays must be sorted since
+ # note that eigenvalue arrays returned by eig must be sorted since
# their order isn't guaranteed.
ev = linalg.eigvalsh(a, 'L')
evalues, evectors = linalg.eig(a)
- ev.sort(axis=-1)
evalues.sort(axis=-1)
- assert_allclose(ev, evalues,
- rtol=get_rtol(ev.dtype))
+ assert_allclose(ev, evalues, rtol=get_rtol(ev.dtype))
ev2 = linalg.eigvalsh(a, 'U')
- ev2.sort(axis=-1)
- assert_allclose(ev2, evalues,
- rtol=get_rtol(ev.dtype))
+ assert_allclose(ev2, evalues, rtol=get_rtol(ev.dtype))
def test_types(self):
def check(dtype):