Skip to content

Commit 90d0b67

Browse files
committed
Fix CI
1 parent fe03333 commit 90d0b67

5 files changed

Lines changed: 23 additions & 12 deletions

File tree

tests/test_lcvx.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ def test_lcvx():
3838
)
3939
B = np.array(
4040
[
41-
[0.5 * dt**2, 0.0, 0.0],
42-
[0.0, 0.5 * dt**2, 0.0],
43-
[0.0, 0.0, 0.5 * dt**2],
41+
[0.5 * dt ** 2, 0.0, 0.0],
42+
[0.0, 0.5 * dt ** 2, 0.0],
43+
[0.0, 0.0, 0.5 * dt ** 2],
4444
[dt, 0.0, 0.0],
4545
[0.0, dt, 0.0],
4646
[0.0, 0.0, dt],
4747
]
4848
)
49-
G = np.array([0.0, 0.0, -0.5 * g * dt**2, 0.0, 0.0, -g * dt])
49+
G = np.array([0.0, 0.0, -0.5 * g * dt ** 2, 0.0, 0.0, -g * dt])
5050
S = np.array([[1.0, 0.0, 0.0, 0.0, 0.0, 0.0], [0.0, 1.0, 0.0, 0.0, 0.0, 0.0]])
5151
c = np.array([0.0, 0.0, -np.tan(0.5 * np.pi - gs), 0.0, 0.0, 0.0])
5252
xT = np.zeros((nx))

tests/test_lcvx_bad_scale.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ def test_lcvx_bad_scaling():
3838
)
3939
B = np.array(
4040
[
41-
[0.5 * dt**2, 0.0, 0.0],
42-
[0.0, 0.5 * dt**2, 0.0],
43-
[0.0, 0.0, 0.5 * dt**2],
41+
[0.5 * dt ** 2, 0.0, 0.0],
42+
[0.0, 0.5 * dt ** 2, 0.0],
43+
[0.0, 0.0, 0.5 * dt ** 2],
4444
[dt, 0.0, 0.0],
4545
[0.0, dt, 0.0],
4646
[0.0, 0.0, dt],
4747
]
4848
)
49-
G = np.array([0.0, 0.0, -0.5 * g * dt**2, 0.0, 0.0, -g * dt])
49+
G = np.array([0.0, 0.0, -0.5 * g * dt ** 2, 0.0, 0.0, -g * dt])
5050
S = np.array([[1.0, 0.0, 0.0, 0.0, 0.0, 0.0], [0.0, 1.0, 0.0, 0.0, 0.0, 0.0]])
5151
c = np.array([0.0, 0.0, -np.tan(0.5 * np.pi - gs), 0.0, 0.0, 0.0])
5252
xT = np.zeros((nx))

tests/test_pdg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ def test_pdg():
4444

4545
# Double integrator dynamics.
4646
Ad = np.block([[np.eye(3), dt * np.eye(3)], [np.zeros((3, 3)), np.eye(3)]])
47-
Bd = np.block([[0.5 * dt**2 * np.eye(3)], [dt * np.eye(3)]])
48-
g = np.array([-0.5 * g0 * dt**2, 0, 0, -g0 * dt, 0, 0])
47+
Bd = np.block([[0.5 * dt ** 2 * np.eye(3)], [dt * np.eye(3)]])
48+
g = np.array([-0.5 * g0 * dt ** 2, 0, 0, -g0 * dt, 0, 0])
4949

5050
# Parse dynamics constraint.
5151
Azdyn = np.block(

tests/test_robust_kalman_filter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ def test_robust_kalman_filter():
2323
A[2, 2] = 1 - gamma * delt
2424
A[3, 3] = 1 - gamma * delt
2525

26-
B[0, 0] = delt**2 / 2
27-
B[1, 1] = delt**2 / 2
26+
B[0, 0] = delt ** 2 / 2
27+
B[1, 1] = delt ** 2 / 2
2828
B[2, 0] = delt
2929
B[3, 1] = delt
3030

tests/utils/cvxpy_to_qoco.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import cvxpy as cp
22
from scipy import sparse
3+
from numpy import int32
34

45

56
def convert(prob):
@@ -24,4 +25,14 @@ def convert(prob):
2425
G = data["A"][p::, :]
2526
h = data["b"][p::]
2627

28+
if P is not None:
29+
P.indices = P.indices.astype(int32)
30+
P.indptr = P.indptr.astype(int32)
31+
if A is not None:
32+
A.indices = A.indices.astype(int32)
33+
A.indptr = A.indptr.astype(int32)
34+
if G is not None:
35+
G.indices = G.indices.astype(int32)
36+
G.indptr = G.indptr.astype(int32)
37+
2738
return n, m, p, P, c, A, b, G, h, l, nsoc, q

0 commit comments

Comments
 (0)