Skip to content

Don't use deprecated np.matrix in tests. #43

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 1 commit into from
Jan 18, 2019
Merged

Don't use deprecated np.matrix in tests. #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions slycot/tests/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ def test_1(self):
synthesis.sb02mt(1,1,1,1)

def test_2(self):
from numpy import matrix
a = matrix("-2 0.5;-1.6 -5")
from numpy import array
a = array([[-2, 0.5], [-1.6, -5]])
Ar, Vr, Yr, VALRr, VALDr = math.mb05md(a, 0.1)

def test_sb02ad(self):
Expand Down
22 changes: 11 additions & 11 deletions slycot/tests/test_sg02ad.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@ def test_sg02ad_case1(self):
m = 1
# from a discussion here:
# https://github.com/scipy/scipy/issues/2251
A = np.matrix([[ 0.63399379, 0.54906824, 0.76253406],
A = np.array([[ 0.63399379, 0.54906824, 0.76253406],
[ 0.5404729 , 0.53745766, 0.08731853],
[ 0.27524045, 0.84922129, 0.4681622 ]])
B = np.matrix([[ 0.96861695],[ 0.05532739],[ 0.78934047]])
Q = np.matrix(np.eye(3))
E = np.matrix(np.eye(3))
R = np.matrix(np.ones((1,1), dtype=float))
S = np.matrix([[-2.67522766, -5.39447418, 2.19128542],
[-1.94918951, -3.15480639, 5.24379117],
[ 4.29133973, 8.10585767, -5.88895897]])
L = np.matrix(np.zeros((3,1)))
B = np.array([[ 0.96861695],[ 0.05532739],[ 0.78934047]])
Q = np.eye(3)
E = np.eye(3)
R = np.ones((1,1), dtype=float)
S = np.array([[-2.67522766, -5.39447418, 2.19128542],
[-1.94918951, -3.15480639, 5.24379117],
[ 4.29133973, 8.10585767, -5.88895897]])
L = np.array(np.zeros((3,1)))
rcondu, X, alphar, alphai, beta, S, T, U, iwarn = \
synthesis.sg02ad('D', 'B', 'N', 'U', 'Z', 'N', 'S', 'R',
n, m, 1,
A, E, B, Q, R, L)
assert_almost_equal(
A.T*X*A - E.T*X*E -
(L + A.T*X*B) * np.linalg.solve (R+B.T*X*B, (L+A.T*X*B).T) +
A.T.dot(X).dot(A) - E.T.dot(X).dot(E) -
(L + A.T.dot(X).dot(B)) .dot( np.linalg.solve (R+B.T.dot(X).dot(B), (L+A.T.dot(X).dot(B)).T) ) +
Q,
np.zeros((n,n)))

Expand Down
19 changes: 8 additions & 11 deletions slycot/tests/test_sg03ad.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,9 @@ def test_sg03ad_a(self):
Xref = np.ones((n,n))
U = np.tril(Xref)
for t in range(0, 50, 10):
A = np.matrix(
2.0**(-t) - np.eye(n) + np.diag(range(1,n+1)) + U.T)
#print(A)
#print(t, n)
E = np.matrix(np.eye(n) + 2**(-t)*U)
Y = A.T*Xref*E + E.T*Xref*A
A = 2.0**(-t) - np.eye(n) + np.diag(range(1,n+1)) + U.T
E = np.eye(n) + 2**(-t)*U
Y = A.T.dot(Xref).dot(E) + E.T.dot(Xref).dot(A)
Q = np.zeros((n,n))
Z = np.zeros((n,n))
A, E, Q, Z, X, scale, sep, ferr, alphar, alphai, beta = \
Expand All @@ -35,20 +32,20 @@ def test_sg03ad_a(self):

def test_sg03ad_3(self):
n = 3
A = np.matrix([[3.0, 1.0, 1.0],
A = np.array([[3.0, 1.0, 1.0],
[1.0, 3.0, 0.0],
[1.0, 0.0, 2.0]])
E = np.matrix([[1.0, 3.0, 0.0],
E = np.array([[1.0, 3.0, 0.0],
[3.0, 2.0, 1.0],
[1.0, 0.0, 1.0]])
Y = np.matrix([[64.0, 73.0, 28.0],
Y = np.array([[64.0, 73.0, 28.0],
[73.0, 70.0, 25.0],
[28.0, 25.0, 18.0]])
Xref = np.array([[-2.0000, -1.0000, 0.0000],
[-1.0000, -3.0000, -1.0000],
[0.0000, -1.0000, -3.0000]])
Q = np.matrix(np.zeros((3,3)))
Z = np.matrix(np.zeros((3,3)))
Q = np.zeros((3,3))
Z = np.zeros((3,3))
A, E, Q, Z, X, scale, sep, ferr, alphar, alphai, beta = \
synthesis.sg03ad('C', 'B', 'N', 'N', 'L', n, A, E, Q, Z, -Y)
#print(A, E, Q, Z, X, scale, sep)
Expand Down