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

Add new test for Kajita algorithm

parent 41d63dee
No related branches found
No related tags found
No related merge requests found
......@@ -113,7 +113,10 @@ ADD_TEST(TestHerdt2010 TestHerdt2010
####################
IF(HRP2_DYNAMICS_FOUND)
MESSAGE(STATUS "hrp2-dynamics taken into account")
CONFIG_FILES_CMAKE(TestKajita2003FGPI.datref)
CONFIG_FILES_CMAKE(TestKajita2003StraightWalkingTestFGPI.datref)
CONFIG_FILES_CMAKE(TestKajita2003CircleTestFGPI.datref)
CONFIG_FILES_CMAKE(TestKajita2003PbFlorentSeq1TestFGPI.datref)
CONFIG_FILES_CMAKE(TestKajita2003PbFlorentSeq2TestFGPI.datref)
ADD_EXECUTABLE(TestKajita2003
../src/portability/gettimeofday.cc
......
......@@ -58,13 +58,10 @@ protected:
virtual void SpecializedRobotConstructor( CjrlHumanoidDynamicRobot *& aHDR,
CjrlHumanoidDynamicRobot *& aDebugHDR)
{
ODEBUG3("Going through TestKajita2003::SpecializedRobotConstructor.");
dynamicsJRLJapan::ObjectFactory aRobotDynamicsObjectConstructor;
Chrp2OptHumanoidDynamicRobot *aHRP2HDR= new Chrp2OptHumanoidDynamicRobot(&aRobotDynamicsObjectConstructor);
aHDR = aHRP2HDR;
aDebugHDR = new Chrp2OptHumanoidDynamicRobot(&aRobotDynamicsObjectConstructor);
ODEBUG3("End of TestKajita2003::SpecializedRobotConstructor.");
}
......@@ -258,12 +255,12 @@ protected:
int PerformTests(int argc, char *argv[])
{
std::string TestNames[4] = { "TestKajita2003Circle",
"TestKajita2003StraightWalking",
std::string TestNames[4] = { "TestKajita2003StraightWalking",
"TestKajita2003Circle",
"TestKajita2003PbFlorentSeq1",
"TestKajita2003PbFlorentSeq2"};
int TestProfiles[4] = { PROFIL_CIRCLE,
PROFIL_STRAIGHT_WALKING,
int TestProfiles[4] = { PROFIL_STRAIGHT_WALKING,
PROFIL_CIRCLE,
PROFIL_PB_FLORENT_SEQ1,
PROFIL_PB_FLORENT_SEQ2};
......
......@@ -142,10 +142,7 @@ namespace PatternGeneratorJRL
PatternGeneratorInterface * & aPGI)
{
// Creating the humanoid robot.
ODEBUG3("Before calling the robot constructor.");
SpecializedRobotConstructor(aHDR,aDebugHDR);
ODEBUG3("After calling the robot constructor.");
if ((aHDR==0) || (aDebugHDR==0))
{
......
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