Skip to content
Snippets Groups Projects
Commit dcc5fae2 authored by Olivier Stasse's avatar Olivier Stasse Committed by mnaveau
Browse files

Fix pb with pinocchio-devel getFrameParent->getFrameId

Fix pb with unitary tests.
parent 336d19d8
No related branches found
No related tags found
No related merge requests found
Subproject commit 5663a002a905b5c8d84a69d8e74044a8e34a48ed
Subproject commit 1ad984575ca91a4e19ce9eb9d092e92d09fcb7fb
......@@ -144,12 +144,12 @@ bool PinocchioRobot::initializeRobotModelAndData(se3::Model * robotModel,
m_robotModel = robotModel;
// initialize the short cut for the joint ids
m_chest = m_robotModel->getFrameParent("torso");
m_waist = m_robotModel->getFrameParent("BODY");
m_leftFoot.associatedAnkle = m_robotModel->getFrameParent("l_ankle");
m_rightFoot.associatedAnkle = m_robotModel->getFrameParent("r_ankle");
m_leftWrist = m_robotModel->getFrameParent("l_wrist");
m_rightWrist = m_robotModel->getFrameParent("r_wrist");
m_chest = m_robotModel->getFrameId("torso");
m_waist = m_robotModel->getFrameId("BODY");
m_leftFoot.associatedAnkle = m_robotModel->getFrameId("l_ankle");
m_rightFoot.associatedAnkle = m_robotModel->getFrameId("r_ankle");
m_leftWrist = m_robotModel->getFrameId("l_wrist");
m_rightWrist = m_robotModel->getFrameId("r_wrist");
DetectAutomaticallyShoulders();
// intialize the "initial pose" (q=[0]) data
......
......@@ -113,6 +113,31 @@ MACRO(ADD_JRL_WALKGEN_TEST test_arg test_file_name)
ENDMACRO(ADD_JRL_WALKGEN_TEST)
MACRO(ADD_JRL_WALKGEN_EXE test_arg test_file_name)
SET(test_name "${test_arg}${BITS}")
ADD_EXECUTABLE(${test_name}
${test_file_name}
TestObject.cpp
CommonTools.cpp
ClockCPUTime.cpp
../src/portability/gettimeofday.cc
)
MESSAGE(STATUS "Prepare test : " ${test_name})
SET(urdfpath
${SIMPLE_HUMANOID_DESCRIPTION_PKGDATAROOTDIR}/simple_humanoid_description/urdf/simple_humanoid.urdf
)
SET(srdfpath
${SIMPLE_HUMANOID_DESCRIPTION_PKGDATAROOTDIR}/simple_humanoid_description/srdf/simple_humanoid.srdf
)
LIST(APPEND LOGGING_WATCHED_VARIABLES urdfpath srdfpath)
TARGET_LINK_LIBRARIES(${test_name} ${PROJECT_NAME})
PKG_CONFIG_USE_DEPENDENCY(${test_name} jrl-mal)
ENDMACRO(ADD_JRL_WALKGEN_EXE)
#######################
## Test Morisawa 2007 #
......@@ -123,12 +148,12 @@ ENDMACRO(ADD_JRL_WALKGEN_TEST)
# the following disabled test case are just useful code for offline
# motion generation using the specialized inverse kinmatics of a robot
#ADD_JRL_WALKGEN_TEST(TestMorisawa2007ShortWalk TestMorisawa2007.cpp)
#ADD_JRL_WALKGEN_TEST(TestMorisawa2007Climbing TestMorisawa2007.cpp)
#ADD_JRL_WALKGEN_TEST(TestMorisawa2007GoingDown TestMorisawa2007.cpp)
#ADD_JRL_WALKGEN_TEST(TestMorisawa2007SteppingStones TestMorisawa2007.cpp)
#ADD_JRL_WALKGEN_TEST(TestMorisawa2007WalkingOnBeam TestMorisawa2007.cpp)
#ADD_JRL_WALKGEN_TEST(TestMorisawa2007GoThroughWall TestMorisawa2007.cpp)
ADD_JRL_WALKGEN_EXE(TestMorisawa2007ShortWalk TestMorisawa2007.cpp)
ADD_JRL_WALKGEN_EXE(TestMorisawa2007Climbing TestMorisawa2007.cpp)
ADD_JRL_WALKGEN_EXE(TestMorisawa2007GoingDown TestMorisawa2007.cpp)
ADD_JRL_WALKGEN_EXE(TestMorisawa2007SteppingStones TestMorisawa2007.cpp)
ADD_JRL_WALKGEN_EXE(TestMorisawa2007WalkingOnBeam TestMorisawa2007.cpp)
ADD_JRL_WALKGEN_EXE(TestMorisawa2007GoThroughWall TestMorisawa2007.cpp)
####################
## Test Herdt 2010 #
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment