chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Add mju_mulVecMatVec, mutiplies a square matrix M by a vector x on both sides. Returns x^T * M * x.

Browse Source 
PiperOrigin-RevId: 474292806
Change-Id: I3432469dbe1f02ccf5a13241c7aa12d824cbe034
This commit is contained in:
Yuval Tassa
2022-09-14 08:04:40 -07:00
committed by Copybara-Service
parent ee9eccc992
commit f4e7fa97af
12 changed files with 109 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/engine/engine_util_blas_test.cc
+12
View File
@@ -41,5 +41,17 @@ TEST_F(EngineUtilBlasTest, MjuDot) {
EXPECT_EQ(mju_dot(a, b, 7), 7 + 2*6 + 3*5 + 4*4 + 5*3 + 6*2 + 7);
}
TEST_F(EngineUtilBlasTest, MjuMulVecMatVec) {
mjtNum vec1[] = {1, 2, 3};
mjtNum vec2[] = {3, 2, 1};
mjtNum mat[] = {
1, 2, 3,
4, 5, 6,
7, 8, 9
};
EXPECT_EQ(mju_mulVecMatVec(vec1, mat, vec2, 3), 204);
}
} // namespace
} // namespace mujoco
test/engine/engine_util_solve_test.cc
+5 -9
View File
@@ -75,10 +75,8 @@ TEST_F(QCQP3Test, DegenerateAMatrix) {
using BoxQPTest = MujocoTest;
// utility: compute QP objective = 0.5*x'*H*x + x'*g
mjtNum objective(const mjtNum* x, const mjtNum* H, const mjtNum* g, int n,
mjtNum* temp) {
mju_mulMatVec(temp, H, x, n, n);
return 0.5 * mju_dot(x, temp, n) + mju_dot(x, g, n);
mjtNum objective(const mjtNum* x, const mjtNum* H, const mjtNum* g, int n) {
return 0.5 * mju_mulVecMatVec(x, H, x, n) + mju_dot(x, g, n);
}
// utility: test if res is the minimum of a given box-QP problem
@@ -86,11 +84,10 @@ bool isQPminimum(const mjtNum* res, const mjtNum* H, const mjtNum* g, int n,
const mjtNum* lower, const mjtNum* upper) {
static const mjtNum eps = 1e-4; // epsilon used for nudging
bool is_minimum = true;
mjtNum* temp = (mjtNum*) mju_malloc(sizeof(mjtNum)*n);
mjtNum* res_nudge = (mjtNum*) mju_malloc(sizeof(mjtNum)*n);
// get solution value
mjtNum value = objective(res, H, g, n, temp);
mjtNum value = objective(res, H, g, n);
mjtNum value_nudge;
// compare to nudged solution
@@ -102,7 +99,7 @@ bool isQPminimum(const mjtNum* res, const mjtNum* H, const mjtNum* g, int n,
if (lower) {
res_nudge[i] = mju_max(lower[i], res_nudge[i]);
}
value_nudge = objective(res_nudge, H, g, n, temp);
value_nudge = objective(res_nudge, H, g, n);
if (value_nudge - value < 0) {
is_minimum = false;
break;
@@ -113,7 +110,7 @@ bool isQPminimum(const mjtNum* res, const mjtNum* H, const mjtNum* g, int n,
if (upper) {
res_nudge[i] = mju_min(upper[i], res_nudge[i]);
}
value_nudge = objective(res_nudge, H, g, n, temp);
value_nudge = objective(res_nudge, H, g, n);
if (value_nudge - value < 0) {
is_minimum = false;
break;
@@ -124,7 +121,6 @@ bool isQPminimum(const mjtNum* res, const mjtNum* H, const mjtNum* g, int n,
}
mju_free(res_nudge);
mju_free(temp);
return is_minimum;
}