Skip to content

Commit 0d4f9f7

Browse files
0.3.0 requiring arb 2.16.0
1 parent 414dabf commit 0d4f9f7

5 files changed

Lines changed: 18 additions & 16 deletions

File tree

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ before_install:
1414
- pip install Cython
1515
- sudo apt-get install libmpfr-dev
1616
- sudo apt-get install libflint-dev
17-
- wget https://github.com/fredrik-johansson/arb/archive/2.15.0.tar.gz
18-
- mv 2.15.0.tar.gz arb-2.15.0.tar.gz
19-
- tar -xf arb-2.15.0.tar.gz
20-
- cd arb-2.15.0
17+
- wget https://github.com/fredrik-johansson/arb/archive/2.16.0.tar.gz
18+
- mv 2.16.0.tar.gz arb-2.16.0.tar.gz
19+
- tar -xf arb-2.16.0.tar.gz
20+
- cd arb-2.16.0
2121
- ./configure --disable-static
2222
- make -j4
2323
- sudo make install

doc/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
# built documents.
5252
#
5353
# The short X.Y version.
54-
version = '0.2.0'
54+
version = '0.3.0'
5555
# The full version, including alpha/beta/rc tags.
56-
release = '0.2.0'
56+
release = '0.3.0'
5757

5858
# The language for content autogenerated by Sphinx. Refer to documentation
5959
# for a list of supported languages.

doc/source/setup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Setup
22
===============================================================================
33

4-
First install both FLINT (version 2.5 or later) and Arb (version 2.15 or later).
4+
First install both FLINT (version 2.5 or later) and Arb (version 2.16 or later).
55
See:
66

77
* http://flintlib.org/

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from Cython.Distutils import build_ext
77
from numpy.distutils.system_info import default_include_dirs, default_lib_dirs
88

9-
109
from distutils.sysconfig import get_config_vars
1110

1211
(opt,) = get_config_vars('OPT')
@@ -40,7 +39,7 @@
4039
cmdclass={'build_ext': build_ext},
4140
ext_modules=ext_modules,
4241
description='Bindings for FLINT and Arb',
43-
version='0.2.0',
42+
version='0.3.0',
4443
url='https://github.com/python-flint/python-flint',
4544
author='Fredrik Johansson',
4645
author_email='fredrik.johansson@gmail.com',

src/acb_mat.pyx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ cdef class acb_mat(flint_mat):
622622
Computes eigenvalues and optionally eigenvectors of this matrix.
623623
Returns either *E*, (*E*, *L*), (*E*, *R*) or (*E*, *L*, *R*)
624624
depending on whether the flags *left* and *right* are set,
625-
where *E* is a row matrix of the eigenvalues, *L* is a matrix
625+
where *E* is a list of the eigenvalues, *L* is a matrix
626626
with the left eigenvectors as rows, and *R* is a matrix
627627
with the right eigenvectors as columns.
628628
@@ -649,7 +649,7 @@ cdef class acb_mat(flint_mat):
649649
>>> A = acb_mat([[2,3,5],[7,11,13],[17,19,23]])
650650
>>> E, L, R = A.eig(left=True, right=True)
651651
>>> D = acb_mat(3,3)
652-
>>> for i in range(3): D[i,i] = E[0,i]
652+
>>> for i in range(3): D[i,i] = E[i]
653653
...
654654
>>> (L*A*R - D).contains(acb_mat(3,3))
655655
True
@@ -713,7 +713,7 @@ cdef class acb_mat(flint_mat):
713713
cdef acb_mat_struct *LP
714714
cdef acb_mat_struct *RP
715715
cdef mag_struct * magp
716-
cdef long n, prec
716+
cdef long i, n, prec
717717
cdef int success
718718
cdef mag_t tolm
719719
n = s.nrows()
@@ -768,10 +768,13 @@ cdef class acb_mat(flint_mat):
768768
raise ValueError("failed to isolate eigenvalues (try higher prec, multiple=True for multiple eigenvalues, or nonstop=True to avoid the exception)")
769769
if tol is not None:
770770
mag_clear(tolm)
771+
Elist = [acb() for i in range(n)]
772+
for i in range(n):
773+
acb_swap((<acb>(Elist [i])).val, acb_mat_entry(E.val, 0, i))
771774
if not left and not right:
772-
return E
775+
return Elist
773776
if left and right:
774-
return E, L, R
777+
return Elist, L, R
775778
if left:
776-
return E, L
777-
return E, R
779+
return Elist, L
780+
return Elist, R

0 commit comments

Comments
 (0)