diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-06-22 14:39:47 -0400 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-06-22 14:39:47 -0400 |
| commit | 10c9091ad8ca3b44e4fb03656e14091a3d9cf763 (patch) | |
| tree | 435b29b50700ee9ae2a9b683e9c29d1919abd7dd /numpy/linalg/linalg.py | |
| parent | d2d1dd5accbd6bbd5a2d8f3fac0dbfc6fb9b4e18 (diff) | |
| parent | b5bbb64cabb305b284e124bd60948bbbbfcac43c (diff) | |
| download | numpy-10c9091ad8ca3b44e4fb03656e14091a3d9cf763.tar.gz | |
Merge pull request #6003 from argriffing/eigh-ascending-eigenvalues
MAINT: eigenvalues returned by eigh are ascending
Diffstat (limited to 'numpy/linalg/linalg.py')
| -rw-r--r-- | numpy/linalg/linalg.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py index 45e12f1a3..07a7a0d42 100644 --- a/numpy/linalg/linalg.py +++ b/numpy/linalg/linalg.py @@ -953,7 +953,7 @@ def eigvalsh(a, UPLO='L'): Broadcasting rules apply, see the `numpy.linalg` documentation for details. - The eigenvalues are computed using LAPACK routines _ssyevd, _heevd + The eigenvalues are computed using LAPACK routines _syevd, _heevd Examples -------- @@ -1151,7 +1151,8 @@ def eigh(a, UPLO='L'): Returns ------- w : (..., M) ndarray - The eigenvalues, not necessarily ordered. + The eigenvalues in ascending order, each repeated according to + its multiplicity. v : {(..., M, M) ndarray, (..., M, M) matrix} The column ``v[:, i]`` is the normalized eigenvector corresponding to the eigenvalue ``w[i]``. Will return a matrix object if `a` is @@ -1175,7 +1176,7 @@ def eigh(a, UPLO='L'): Broadcasting rules apply, see the `numpy.linalg` documentation for details. - The eigenvalues/eigenvectors are computed using LAPACK routines _ssyevd, + The eigenvalues/eigenvectors are computed using LAPACK routines _syevd, _heevd The eigenvalues of real symmetric or complex Hermitian matrices are |