Skip to content

Commit bdc7b5b

Browse files
Copilotmmcky
andcommitted
Fix @ operator issues with scalar parameters in lqnash and update docstring
Co-authored-by: mmcky <[email protected]>
1 parent 3963ef8 commit bdc7b5b

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

quantecon/_lqnash.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def nnash(A, B1, B2, R1, R2, Q1, Q2, S1, S2, W1, W2, M1, M2,
3030
3131
Parameters
3232
----------
33-
A : scalar(float) or array_like(float)
33+
A : array_like(float)
3434
Corresponds to the above equation, should be of size (n, n)
3535
B1 : scalar(float) or array_like(float)
3636
As above, size (n, k_1)
@@ -117,22 +117,22 @@ def nnash(A, B1, B2, R1, R2, Q1, Q2, S1, S2, W1, W2, M1, M2,
117117
H1 = G1 @ B1.T @ P1
118118

119119
# break up the computation of F1, F2
120-
F1_left = v1 - ((H1 @ B2 + G1 @ M1.T) @
121-
(H2 @ B1 + G2 @ M2.T))
122-
F1_right = H1 @ A + G1 @ W1.T - ((H1 @ B2 + G1 @ M1.T) @
123-
(H2 @ A + G2 @ W2.T))
120+
F1_left = v1 - ((H1 @ B2 + G1.dot(M1.T)) @
121+
(H2 @ B1 + G2.dot(M2.T)))
122+
F1_right = H1 @ A + G1.dot(W1.T) - ((H1 @ B2 + G1.dot(M1.T)) @
123+
(H2 @ A + G2.dot(W2.T)))
124124
F1 = solve(F1_left, F1_right)
125-
F2 = H2 @ A + G2 @ W2.T - ((H2 @ B1 + G2 @ M2.T) @ F1)
125+
F2 = H2 @ A + G2.dot(W2.T) - ((H2 @ B1 + G2.dot(M2.T)) @ F1)
126126

127127
Lambda1 = A - B2 @ F2
128128
Lambda2 = A - B1 @ F1
129-
Pi1 = R1 + (F2.T @ S1 @ F2)
130-
Pi2 = R2 + (F1.T @ S2 @ F1)
129+
Pi1 = R1 + (F2.T @ S1.dot(F2))
130+
Pi2 = R2 + (F1.T @ S2.dot(F1))
131131

132132
P1 = (Lambda1.T @ P1 @ Lambda1) + Pi1 - \
133-
((Lambda1.T @ P1 @ B1) + W1 - F2.T @ M1) @ F1
133+
((Lambda1.T @ P1 @ B1) + W1 - F2.T.dot(M1)) @ F1
134134
P2 = (Lambda2.T @ P2 @ Lambda2) + Pi2 - \
135-
((Lambda2.T @ P2 @ B2) + W2 - F1.T @ M2) @ F2
135+
((Lambda2.T @ P2 @ B2) + W2 - F1.T.dot(M2)) @ F2
136136

137137
dd = np.max(np.abs(F10 - F1)) + np.max(np.abs(F20 - F2))
138138

0 commit comments

Comments
 (0)