Skip to content

fix invalid variable usages from wrapper outputs #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roryyorke merged 13 commits into from
Apr 10, 2020
Merged

fix invalid variable usages from wrapper outputs #79

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5896144
fix invalid variable usages from wrapper outputs
Aug 10, 2019
594b3db
delete unused mathematical.pyf
Aug 10, 2019
abb9f79
fix math
Aug 10, 2019
af8927f
only return complex list when necessary, add unittest for mb05md
Aug 10, 2019
93c34db
remove var porm
Aug 10, 2019
961f172
fix docstring of mb05md()
Aug 10, 2019
6572201
clean up pep8 issues in mb05md
Aug 10, 2019
ae14a6b
clean more pep8 issues, fix mb05nd, add unittest for mb05nd
Aug 10, 2019
2bac74e
fix CMakeLists, remove stub test_2
Aug 10, 2019
2a3c98c
make test_mb.py executable
Aug 10, 2019
8bc7a4e
add unittests for mc01td, fix dp constraint
Aug 10, 2019
b1205d4
fix typo in test_mb
Aug 11, 2019
793625d
Merge branch 'master' into fix-unused-vars
bnavigator Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
clean up pep8 issues in mb05md
  • Loading branch information
Benjamin Greiner
Benjamin Greiner committed Aug 10, 2019
commit 6572201b9de869c090acbad1d6685e9a1a7fbe9e
26 changes: 15 additions & 11 deletions slycot/math.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def mb05md(a, delta, balanc='N'):
Square matrix
delta : input 'd'
The scalar value delta of the problem.

Optional arguments:
balanc : input char*1
Indicates how the input matrix should be diagonally scaled
Expand All @@ -116,7 +116,7 @@ def mb05md(a, delta, balanc='N'):
(k+1)-th columns of the eigenvector matrix, respectively,
then the eigenvector corresponding to the complex
eigenvalue with positive (negative) imaginary value is
given by
given by
p + q*j (p - q*j), where j^2 = -1.
Yr : output rank-2 array('d') with bounds (n,n)
contains an intermediate result for computing the matrix
Expand All @@ -135,17 +135,21 @@ def mb05md(a, delta, balanc='N'):
imaginary part first.
"""
hidden = ' (hidden by the wrapper)'
arg_list = [ 'balanc', 'n', 'delta', 'a', 'lda'+hidden, 'v', 'ldv'+hidden,
'y','ldy'+hidden,'valr','vali',
'iwork'+hidden,'dwork'+hidden,'ldwork'+hidden,'info'+hidden]
n=min(a.shape)
(Ar,Vr,Yr,VALr,VALi,INFO) = _wrapper.mb05md(balanc=balanc,n=n,delta=delta,a=a)
arg_list = ['balanc', 'n', 'delta', 'a', 'lda'+hidden, 'v', 'ldv'+hidden,
'y', 'ldy'+hidden, 'valr', 'vali',
'iwork'+hidden, 'dwork'+hidden, 'ldwork'+hidden,
'info'+hidden]
n = min(a.shape)
(Ar, Vr, Yr, VALr, VALi, INFO) = _wrapper.mb05md(balanc=balanc,
n=n,
delta=delta,
a=a)
if INFO == 0:
if not all(VALi==0):
VAL=VALr+1J*VALi
if not all(VALi == 0):
VAL = VALr + 1J*VALi
else:
VAL=VALr
return (Ar,Vr,Yr,VAL)
VAL = VALr
return (Ar, Vr, Yr, VAL)
elif INFO < 0:
error_text = "The following argument had an illegal value: "+arg_list[-INFO-1]
elif INFO > 0 and INFO <= n:
Expand Down