Skip to content

Commit 350193f

Browse files
committed
[Test] fix YOU_MIXED_MATRICES_OF_DIFFERENT_SIZES on recent Eigen
While here, add a symlink to test_data if the build directory is not the root one
1 parent 4538f69 commit 350193f

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

test/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,9 @@ TARGET_LINK_LIBRARIES(static-equilibrium ${PROJECT_NAME})
1111
ADD_UNIT_TEST(lp-solvers test_LP_solvers)
1212
PKG_CONFIG_USE_DEPENDENCY(lp-solvers eigen3)
1313
TARGET_LINK_LIBRARIES(lp-solvers ${PROJECT_NAME} ${QPOASES_LIBRARY})
14+
15+
IF(NOT ${PROJECT_SOURCE_DIR} STREQUAL ${PROJECT_BINARY_DIR})
16+
ADD_CUSTOM_TARGET(link_target ALL COMMAND ${CMAKE_COMMAND} -E create_symlink
17+
"${PROJECT_SOURCE_DIR}/test_data"
18+
"${PROJECT_BINARY_DIR}/test_data")
19+
ENDIF(NOT ${PROJECT_SOURCE_DIR} STREQUAL ${PROJECT_BINARY_DIR})

test/test_static_equilibrium.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ int test_computeEquilibriumRobustness_vs_checkEquilibrium(Equilibrium* solver_1,
4242
bool equilibrium;
4343
for (unsigned int i = 0; i < comPositions.rows(); i++) {
4444
if (!PERF_STRING_1.empty()) getProfiler().start(PERF_STRING_1);
45-
status = solver_1->computeEquilibriumRobustness(comPositions.row(i), rob);
45+
status = solver_1->computeEquilibriumRobustness(comPositions.row(i).transpose(), rob);
4646
if (!PERF_STRING_1.empty()) getProfiler().stop(PERF_STRING_1);
4747

4848
if (status != LP_STATUS_OPTIMAL) {
@@ -54,7 +54,7 @@ int test_computeEquilibriumRobustness_vs_checkEquilibrium(Equilibrium* solver_1,
5454
}
5555

5656
if (!PERF_STRING_2.empty()) getProfiler().start(PERF_STRING_2);
57-
status = solver_2->checkRobustEquilibrium(comPositions.row(i), equilibrium);
57+
status = solver_2->checkRobustEquilibrium(comPositions.row(i).transpose(), equilibrium);
5858
if (!PERF_STRING_2.empty()) getProfiler().stop(PERF_STRING_2);
5959

6060
if (status != LP_STATUS_OPTIMAL) {
@@ -99,7 +99,7 @@ int test_computeEquilibriumRobustness(Equilibrium* solver_1, Equilibrium* solver
9999
LP_status status;
100100
for (unsigned int i = 0; i < comPositions.rows(); i++) {
101101
getProfiler().start(PERF_STRING_1);
102-
status = solver_1->computeEquilibriumRobustness(comPositions.row(i), rob_1);
102+
status = solver_1->computeEquilibriumRobustness(comPositions.row(i).transpose(), rob_1);
103103
getProfiler().stop(PERF_STRING_1);
104104

105105
if (status != LP_STATUS_OPTIMAL) {
@@ -111,7 +111,7 @@ int test_computeEquilibriumRobustness(Equilibrium* solver_1, Equilibrium* solver
111111
}
112112

113113
getProfiler().start(PERF_STRING_2);
114-
status = solver_2->computeEquilibriumRobustness(comPositions.row(i), rob_2);
114+
status = solver_2->computeEquilibriumRobustness(comPositions.row(i).transpose(), rob_2);
115115
getProfiler().stop(PERF_STRING_2);
116116

117117
if (status != LP_STATUS_OPTIMAL) {
@@ -257,7 +257,7 @@ void drawRobustnessGrid(int N_CONTACTS, int GRID_SIZE, Equilibrium* solver, Cref
257257
double rob;
258258
LP_status status;
259259
for (unsigned int i = 0; i < comPositions.rows(); i++) {
260-
status = solver->computeEquilibriumRobustness(comPositions.row(i), rob);
260+
status = solver->computeEquilibriumRobustness(comPositions.row(i).transpose(), rob);
261261
if (status != LP_STATUS_OPTIMAL) {
262262
SEND_ERROR_MSG("Faild to compute equilibrium robustness of com position " + toString(comPositions.row(i)) +
263263
", error code " + toString(status));
@@ -296,8 +296,8 @@ void generateContacts(unsigned int N_CONTACTS, double MIN_CONTACT_DISTANCE, doub
296296

297297
// generate contact orientation
298298
uniform(RPY_LOWER_BOUNDS, RPY_UPPER_BOUNDS, contact_rpy.row(i));
299-
generate_rectangle_contacts(LX, LY, contact_pos.row(i), contact_rpy.row(i), p.middleRows<4>(i * 4),
300-
N.middleRows<4>(i * 4));
299+
generate_rectangle_contacts(LX, LY, contact_pos.row(i).transpose(), contact_rpy.row(i).transpose(),
300+
p.middleRows<4>(i * 4), N.middleRows<4>(i * 4));
301301
// printf("Contact surface %d position (%.3f,%.3f,%.3f) ", i, contact_pos(i,0), contact_pos(i,1),
302302
// contact_pos(i,2)); printf("Orientation (%.3f,%.3f,%.3f)\n", contact_rpy(i,0), contact_rpy(i,1),
303303
// contact_rpy(i,2));

0 commit comments

Comments
 (0)