Commit 39c7820a authored by Olivier Stasse's avatar Olivier Stasse
Browse files

Remove deprecated headers + reinforce header name policy

parent c4480179
......@@ -36,7 +36,7 @@
#include <deque>
#include <robotDynamics/jrlHumanoidDynamicRobot.h>
#include <walkGenJrl/PGTypes.h>
#include <jrl/walkgen/pgtypes.hh>
namespace PatternGeneratorJRL
{
......
......@@ -41,7 +41,7 @@
# define WALK_GEN_JRL_EXPORT
#endif
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
namespace PatternGeneratorJRL
{
......
......@@ -36,14 +36,14 @@
#include <deque>
/*! MatrixAbstractLayer */
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
/* dynamics JRL Japan related inclusions */
#include <robotDynamics/jrlFoot.h>
/* Walking pattern generation related inclusions */
#include <PGTypes.h>
#include <jrl/walkgen/pgtypes.hh>
#include <SimplePlugin.h>
namespace PatternGeneratorJRL
......
......@@ -30,7 +30,7 @@
#ifndef _LEFT_AND_RIGHT_FOOT_TRAJECTORY_GENERATION_MULTIPLE_H_
#define _LEFT_AND_RIGHT_FOOT_TRAJECTORY_GENERATION_MULTIPLE_H_
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
/* abstractRobotDynamics inclusion */
#include <robotDynamics/jrlFoot.h>
......
......@@ -27,7 +27,7 @@
*/
#include <SimplePlugin.h>
#include <PGTypes.h>
#include <jrl/walkgen/pgtypes.hh>
#include <MotionGeneration/ComAndFootRealization.h>
#include <GlobalStrategyManagers/GlobalStrategyManager.h>
......
......@@ -30,14 +30,14 @@
/*! JRL inclusion */
// MAL
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
// Dynamics
#include <robotDynamics/jrlHumanoidDynamicRobot.h>
// PG
#include <PGTypes.h>
#include <jrl/walkgen/pgtypes.hh>
#include <SimplePlugin.h>
#include <PreviewControl/PreviewControl.h>
......
......@@ -36,12 +36,12 @@
#include <string>
#include <sstream>
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
#include <robotDynamics/jrlHumanoidDynamicRobot.h>
#include <PGTypes.h>
#include <jrl/walkgen/pgtypes.hh>
#include <Mathematics/ConvexHull.h>
#include <SimplePlugin.h>
......
......@@ -37,12 +37,12 @@
#include <string>
#include <sstream>
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
#include <robotDynamics/jrlHumanoidDynamicRobot.h>
#include <PGTypes.h>
#include <jrl/walkgen/pgtypes.hh>
#include <privatepgtypes.h>
#include <Mathematics/ConvexHull.h>
#include <Mathematics/FootHalfSize.hh>
......
......@@ -34,7 +34,7 @@
#include <vector>
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
using namespace::std;
......
......@@ -34,7 +34,7 @@
#include <vector>
#include <deque>
#include <Mathematics/OptCholesky.h>
#include <walkGenJrl/PGTypes.h>
#include <jrl/walkgen/pgtypes.hh>
namespace Optimization
{
......
......@@ -27,7 +27,7 @@
#include <iostream>
#include <vector>
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
#include <Mathematics/StepOverPolynome.h>
......
......@@ -33,7 +33,7 @@
#include <vector>
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
#include <Mathematics/Polynome.h>
......
......@@ -35,7 +35,7 @@
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
#include <vector>
#include <string>
......
......@@ -172,8 +172,8 @@ Initialization()
vector3d RightFootSoleCenter,LeftFootSoleCenter;
RightFoot->getSoleCenterInLocalFrame(RightFootSoleCenter);
LeftFoot->getSoleCenterInLocalFrame(LeftFootSoleCenter);
RightFoot->getProjectionCenterLocalFrameInSole(RightFootSoleCenter);
LeftFoot->getProjectionCenterLocalFrameInSole(LeftFootSoleCenter);
double lWidth,lHeight,lDepth;
lDepth = lAnklePositionRight[2];
......@@ -435,7 +435,7 @@ InitializationCoM(MAL_VECTOR(,double) &BodyAnglesIni,
CjrlFoot * RightFoot = aDMB->rightFoot();
matrix4d lFootPose = RightFoot->associatedAnkle()->currentTransformation();
vector3d RightFootSoleCenter;
RightFoot->getSoleCenterInLocalFrame(RightFootSoleCenter);
RightFoot->getProjectionCenterLocalFrameInSole(RightFootSoleCenter);
MAL_S3_VECTOR_ACCESS(m_COGInitialAnkles,0) = MAL_S4x4_MATRIX_ACCESS_I_J(lFootPose,0,3);
MAL_S3_VECTOR_ACCESS(m_COGInitialAnkles,1) = MAL_S4x4_MATRIX_ACCESS_I_J(lFootPose,1,3);
......
......@@ -31,7 +31,7 @@
#define _COM_AND_FOOT_REALIZATION_BY_GEOMETRY_H_
#include <PGTypes.h>
#include <jrl/walkgen/pgtypes.hh>
#include <MotionGeneration/ComAndFootRealization.h>
#include <MotionGeneration/StepOverPlanner.h>
#include <MotionGeneration/WaistHeightVariation.h>
......
......@@ -31,7 +31,7 @@
#include <iostream>
#include <fstream>
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
#include <PreviewControl/PreviewControl.h>
#include <ZMPRefTrajectoryGeneration/ZMPDiscretization.h>
......
......@@ -41,7 +41,7 @@
#include <deque>
/*! MAL */
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
/*! Abstract Interface for dynamic robot. */
#include <robotDynamics/jrlHumanoidDynamicRobot.h>
......
......@@ -30,7 +30,7 @@
#ifndef _UPPER_BODY_MOTION_
#define _UPPER_BODY_MOTION_
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
#include <vector>
#include <string>
......
......@@ -48,7 +48,7 @@
#include <string>
#include <deque>
#include <MatrixAbstractLayer/MatrixAbstractLayer.h>
#include <jrl/mal/matrixabstractlayer.hh>
#include <Mathematics/Polynome.h>
......
......@@ -21,7 +21,7 @@
* Research carried out within the scope of the
* Joint Japanese-French Robotics Laboratory (JRL)
*/
#include <walkGenJrl/PGTypes.h>
#include <jrl/walkgen/pgtypes.hh>
namespace PatternGeneratorJRL
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment