Skip to content

Implement MB02ED #214

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
bnavigator merged 13 commits into from
Sep 24, 2023
Merged

Implement MB02ED #214

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
84c9552
mb02ed
saasaa Sep 19, 2023
05fd0b7
fix formatting
saasaa Sep 20, 2023
d373407
added numpydoc style docstring
saasaa Sep 21, 2023
15188ef
fixed typos in docstring
saasaa Sep 21, 2023
bad3c74
Added new test, added checking of input variables
saasaa Sep 23, 2023
7c14647
Merge branch 'python-control:master' into master
saasaa Sep 23, 2023
3a97769
remove checks in wrapper
saasaa Sep 23, 2023
da77ca9
changed Warns to Raises in docstring
saasaa Sep 23, 2023
7da2c4c
remove unused import
saasaa Sep 23, 2023
56609fc
Update docstring, fix checks in signature,
saasaa Sep 23, 2023
bf0d133
remove checks in signature
saasaa Sep 23, 2023
eb93764
Apply suggestions from code review
saasaa Sep 23, 2023
05797af
update docstring
saasaa Sep 23, 2023
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
Apply suggestions from code review 
Co-authored-by: Ben Greiner <code@bnavigator.de>
  • Loading branch information
@saasaa @bnavigator
saasaa and bnavigator authored Sep 23, 2023
commit eb937648e45d0ca4a3cc0ea0d2e21438a904f1bc
8 changes: 4 additions & 4 deletions slycot/math.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import numpy as np


def mb02ed(typet: str,T: np.ndarray, B: np.ndarray, n: int, k: int, nrhs: int):
def mb02ed(typet: str, T: np.ndarray, B: np.ndarray, n: int, k: int, nrhs: int):
""" X, T = mb02ed(typet, T, B, n, k, nrhs)

Solve a system of linear equations T*X = B or X*T = B with a positive
Expand All @@ -39,10 +39,10 @@ def mb02ed(typet: str,T: np.ndarray, B: np.ndarray, n: int, k: int, nrhs: int):
and the system T*X = B is solved.
Note: the notation x / y means that x corresponds to
typet = 'R' and y corresponds to typet = 'C'.
Comment thread
saasaa marked this conversation as resolved.
T : ndarray
T : array_like
The leading k-by-n*k or n*k-by-k part of this array must contain the first
block row/column of an s.p.d. block Toeplitz matrix.
B : ndarray
B : array_like
The leading nrhs-by-n*k or n*k-by-nrhs part of this array must contain the
right-hand side matrix B.
n : int
Expand All @@ -66,7 +66,7 @@ def mb02ed(typet: str,T: np.ndarray, B: np.ndarray, n: int, k: int, nrhs: int):
------
SlycotArithmeticError
:info = 1:
the reduction algorithm failed. The Toeplitz matrix associated
The reduction algorithm failed. The Toeplitz matrix associated
with T is not numerically positive definite.
SlycotParameterError
:info = -1:
Expand Down
5 changes: 1 addition & 4 deletions slycot/tests/test_mb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ def test_mb02ed_parameter_errors():
assert cm.value.info == -4



def test_mb02ed_matrix_error():
Comment thread
saasaa marked this conversation as resolved.
"""Test for a negative definite input matrix in MB02ED"""
n = 3
Expand Down Expand Up @@ -178,15 +177,13 @@ def test_mb02ed_matrix_error():
)

with pytest.raises(SlycotArithmeticError,
match = "\nthe reduction algorithm failed. "
match = "The reduction algorithm failed. "
"The Toeplitz matrix associated\nwith T "
r"is not numerically positive definite.") as cm:
mb02ed(T=T, B=B, n=n, k=k, typet=TYPET, nrhs=nrhs)
assert cm.value.info == 1




def test_mb03rd():
Comment thread
saasaa marked this conversation as resolved.
""" Test for Schur form reduction.

Expand Down