diff --git a/tests/TestNaveau2015.cpp b/tests/TestNaveau2015.cpp index 790e2b717c508f0d475c57918463e3170f6854c0..2e5b50c94ac2d017b5b2bd5fdf219419a6a238ed 100644 --- a/tests/TestNaveau2015.cpp +++ b/tests/TestNaveau2015.cpp @@ -39,8 +39,8 @@ #include "TestObject.hh" #include "MotionGeneration/ComAndFootRealizationByGeometry.hh" -#include "pinocchio/multibody/parser/urdf.hpp" -#include "pinocchio/multibody/parser/srdf.hpp" +//#include "pinocchio/multibody/parser/urdf.hpp" +//#include "pinocchio/multibody/parser/srdf.hpp" using namespace std; using namespace PatternGeneratorJRL; diff --git a/tests/TestObject.cpp b/tests/TestObject.cpp index 140706f4ef3d72e03f1a176957ce37a94b32f38c..66df47c9b9a7748e35fe9baba56fbe652730c741 100644 --- a/tests/TestObject.cpp +++ b/tests/TestObject.cpp @@ -28,8 +28,8 @@ #include <fstream> #include "Debug.hh" #include "TestObject.hh" -#include "pinocchio/multibody/parser/urdf.hpp" -#include "pinocchio/multibody/parser/srdf.hpp" +#include "pinocchio/parsers/urdf.hpp" +#include "pinocchio/parsers/srdf.hpp" using namespace std; #define NB_OF_FIELDS 39 @@ -305,7 +305,8 @@ namespace PatternGeneratorJRL aFoot.anklePosition(1) = v.second.get<double>("y"); aFoot.anklePosition(2) = v.second.get<double>("z"); } - aFoot.associatedAnkle = aModel->getBodyId("r_ankle"); + se3::FrameIndex ra = aModel->getFrameId("r_ankle"); + aFoot.associatedAnkle = aModel->frames[ra].parent ; aPR.initializeRightFoot(aFoot); // Initialize the Left Foot @@ -323,7 +324,8 @@ namespace PatternGeneratorJRL aFoot.anklePosition(1) = v.second.get<double>("y"); aFoot.anklePosition(2) = v.second.get<double>("z"); } - aFoot.associatedAnkle = aModel->getBodyId("l_ankle"); + se3::FrameIndex la = aModel->getBodyId("l_ankle"); + aFoot.associatedAnkle = aModel->frames[la].parent ; aPR.initializeLeftFoot(aFoot); }