Skip to content

Commit c9d7db1

Browse files
committed
fix matrix product
1 parent 51876d6 commit c9d7db1

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

tests/python/test_Tasks.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
const = taskCOM.compute(t, q, v, data)
5858

5959
Jpinv = np.linalg.pinv(const.matrix, 1e-5)
60-
dv = Jpinv * const.vector
60+
dv = Jpinv.dot(const.vector)
6161

62-
assert np.linalg.norm(Jpinv * const.matrix, 2) - 1.0 < tol
62+
assert np.linalg.norm(Jpinv.dot(const.matrix), 2) - 1.0 < tol
6363
v += dt * dv
6464
q = pin.integrate(model, q, dt * v)
6565
t += dt
@@ -113,9 +113,9 @@
113113
const = task_joint.compute(t, q, v, data)
114114

115115
Jpinv = np.linalg.pinv(const.matrix, 1e-5)
116-
dv = Jpinv * const.vector
116+
dv = Jpinv.dot(const.vector)
117117

118-
assert np.linalg.norm(Jpinv * const.matrix, 2) - 1.0 < tol
118+
assert np.linalg.norm(Jpinv.dot(const.matrix), 2) - 1.0 < tol
119119
v += dt * dv
120120
q = pin.integrate(model, q, dt * v)
121121
t += dt
@@ -171,9 +171,9 @@
171171
const = task_se3.compute(t, q, v, data)
172172

173173
Jpinv = np.linalg.pinv(const.matrix, 1e-5)
174-
dv = Jpinv * const.vector
174+
dv = Jpinv.dot(const.vector)
175175

176-
assert np.linalg.norm(Jpinv * const.matrix, 2) - 1.0 < tol
176+
assert np.linalg.norm(Jpinv.dot(const.matrix), 2) - 1.0 < tol
177177

178178
v += dt * dv
179179
q = pin.integrate(model, q, dt * v)
@@ -252,15 +252,15 @@
252252
robot.computeAllTerms(data_next, q_next, v)
253253
J_am = data.Ag
254254
J_am_next = data_next.Ag
255-
drift = (J_am_next[-3:, :] - J_am[-3:, :]) * v / dt
255+
drift = (J_am_next[-3:, :] - J_am[-3:, :]).dot(v) / dt
256256
drift_pin = pin.computeCentroidalMomentumTimeVariation(model, data).angular
257257
diff_drift = norm(drift_pin - drift)
258258
print("Difference between drift computations: ", diff_drift)
259259

260260
Jpinv = np.linalg.pinv(const.matrix, 1e-5)
261-
dv = Jpinv * const.vector
261+
dv = Jpinv.dot(const.vector)
262262

263-
assert np.linalg.norm(Jpinv * const.matrix, 2) - 1.0 < tol
263+
assert np.linalg.norm(Jpinv.dot(const.matrix), 2) - 1.0 < tol
264264
v += dt * dv
265265
q = pin.integrate(model, q, dt * v)
266266
t += dt
@@ -321,9 +321,9 @@
321321
const = task_joint.compute(t, q, v, data)
322322

323323
Jpinv = np.linalg.pinv(const.matrix, 1e-5)
324-
dv = Jpinv * const.vector
324+
dv = Jpinv.dot(const.vector)
325325

326-
assert np.linalg.norm(Jpinv * const.matrix, 2) - 1.0 < tol
326+
assert np.linalg.norm(Jpinv.dot(const.matrix), 2) - 1.0 < tol
327327
v += dt * dv
328328
q = pin.integrate(model, q, dt * v)
329329
t += dt

0 commit comments

Comments
 (0)