Commit a6de9a19 authored by Francois Keith's avatar Francois Keith
Browse files

For normalization purposes, use the DYNAMIC_GRAPH_ENTITY_DECL macro everywhere.

parent 93fd1f3e
......@@ -53,15 +53,13 @@ namespace dynamicgraph {
:public ::dynamicgraph::Entity
,public ::dynamicgraph::EntityHelper<ContactSelecter>
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
ContactSelecter( const std::string & name );
public: /* --- ENTITY INHERITANCE --- */
static const std::string CLASS_NAME;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
virtual void display( std::ostream& os ) const;
void initCommands( void );
......
......@@ -54,7 +54,7 @@ namespace dynamicgraph {
:public ::dynamicgraph::Entity
,public ::dynamicgraph::EntityHelper<ControllerPD>
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
ControllerPD( const std::string & name );
......@@ -72,9 +72,7 @@ namespace dynamicgraph {
public: /* --- ENTITY INHERITANCE --- */
static const std::string CLASS_NAME;
virtual void display( std::ostream& os ) const;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
virtual void commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
......
......@@ -52,16 +52,14 @@ namespace dynamicgraph {
:public ::dynamicgraph::Entity
,public ::dynamicgraph::EntityHelper<DynamicIntegrator>
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
DynamicIntegrator( const std::string & name );
public: /* --- ENTITY INHERITANCE --- */
static const std::string CLASS_NAME;
virtual void display( std::ostream& os ) const;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
virtual void commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
......
......@@ -59,9 +59,7 @@ namespace dynamicgraph {
class SOTFEATUREPROJECTEDLINE_EXPORT FeatureProjectedLine
: public FeatureAbstract
{
public:
static const std::string CLASS_NAME;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
DYNAMIC_GRAPH_ENTITY_DECL();
/* --- SIGNALS ------------------------------------------------------------ */
public:
......
......@@ -62,16 +62,14 @@ namespace dynamicgraph {
:public DynamicIntegrator
,public ::dynamicgraph::EntityHelper<PseudoRobotDynamic>
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
PseudoRobotDynamic( const std::string & name );
public: /* --- ENTITY INHERITANCE --- */
static const std::string CLASS_NAME;
virtual void display( std::ostream& os ) const;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
virtual void commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
......
......@@ -54,16 +54,14 @@ namespace dynamicgraph {
:public ::dynamicgraph::sot::Device
,public ::dynamicgraph::EntityHelper<RobotDynSimu>
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
RobotDynSimu( const std::string & name );
public: /* --- ENTITY INHERITANCE --- */
static const std::string CLASS_NAME;
virtual void display( std::ostream& os ) const;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
typedef ::dynamicgraph::EntityHelper<RobotDynSimu>::EntityClassName
EntityClassName;
......
......@@ -58,7 +58,7 @@ namespace dynamicgraph {
,public ::dynamicgraph::EntityHelper<SolverDynReduced>
,public sot::Stack< TaskDynPD >
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
SolverDynReduced( const std::string & name );
......@@ -78,9 +78,7 @@ namespace dynamicgraph {
public: /* --- ENTITY INHERITANCE --- */
static const std::string CLASS_NAME;
virtual void display( std::ostream& os ) const;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
public: /* --- SIGNALS --- */
......
......@@ -55,7 +55,7 @@ namespace dynamicgraph {
,public ::dynamicgraph::EntityHelper<SolverKine>
,public sot::Stack< TaskAbstract >
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
SolverKine( const std::string & name );
......@@ -75,9 +75,7 @@ namespace dynamicgraph {
public: /* --- ENTITY INHERITANCE --- */
static const std::string CLASS_NAME;
virtual void display( std::ostream& os ) const;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
virtual void commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
......
......@@ -55,7 +55,7 @@ namespace dynamicgraph {
,public ::dynamicgraph::EntityHelper<SolverOpSpace>
,public sot::Stack< TaskDynPD >
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
SolverOpSpace( const std::string & name );
......@@ -75,9 +75,7 @@ namespace dynamicgraph {
public: /* --- ENTITY INHERITANCE --- */
static const std::string CLASS_NAME;
virtual void display( std::ostream& os ) const;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
virtual void commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
......
......@@ -54,16 +54,11 @@ namespace dynamicgraph {
:public TaskDynPD
,public EntityHelper<TaskDynInequality>
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
TaskDynInequality( const std::string& name );
public: /* --- ENTITY INHERITANCE --- */
static const std::string CLASS_NAME;
virtual const std::string& getClassName( void ) { return CLASS_NAME; }
public: /* --- SIGNALS --- */
DECLARE_SIGNAL_IN(referenceInf,ml::Vector);
......
......@@ -58,15 +58,13 @@ namespace dynamicgraph {
:public ::dynamicgraph::sot::dyninv::TaskDynPD
,public ::dynamicgraph::EntityHelper<TaskDynJointLimits>
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
TaskDynJointLimits( const std::string& name );
public: /* --- ENTITY INHERITANCE --- */
typedef TaskDynJointLimits EntityClassName;
static const std::string CLASS_NAME;
virtual const std::string& getClassName( void ) { return CLASS_NAME; }
//virtual void display( std::ostream& os ) const;
public: /* --- SIGNALS --- */
......
......@@ -53,15 +53,13 @@ namespace dynamicgraph {
:public ::dynamicgraph::sot::dyninv::TaskDynPD
,public ::dynamicgraph::EntityHelper<TaskDynLimits>
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
TaskDynLimits( const std::string& name );
public: /* --- ENTITY INHERITANCE --- */
typedef TaskDynLimits EntityClassName;
static const std::string CLASS_NAME;
virtual const std::string& getClassName( void ) { return CLASS_NAME; }
//virtual void display( std::ostream& os ) const;
public: /* --- SIGNALS --- */
......
......@@ -61,7 +61,7 @@ namespace dynamicgraph {
:public ::dynamicgraph::sot::dyninv::TaskDynPD
,public ::dynamicgraph::EntityHelper<TaskDynPassingPoint>
{
DYNAMIC_GRAPH_ENTITY_DECL();
public:
/*! Constructor
@param name: Name of the task (string)
......@@ -70,9 +70,7 @@ namespace dynamicgraph {
/* --- ENTITY INHERITANCE --- */
typedef TaskDynPassingPoint EntityClassName;
static const std::string CLASS_NAME;
virtual void display( std::ostream& os ) const;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
/* --- SIGNALS --- */
DECLARE_SIGNAL_IN(velocityDes, ml::Vector);
......
......@@ -53,16 +53,14 @@ namespace dynamicgraph {
:public ::dynamicgraph::sot::Task
,public ::dynamicgraph::EntityHelper<TaskDynPD>
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
TaskDynPD( const std::string & name );
public: /* --- ENTITY INHERITANCE --- */
static const std::string CLASS_NAME;
virtual void display( std::ostream& os ) const;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
public: /* --- SIGNALS --- */
......
......@@ -53,13 +53,13 @@ namespace dynamicgraph {
:public TaskAbstract
,public EntityHelper<TaskJointLimits>
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
TaskJointLimits( const std::string& name );
public: /* --- ENTITY INHERITANCE --- */
DYNAMIC_GRAPH_ENTITY_DECL();
virtual void display( std::ostream& os ) const;
public: /* --- SIGNALS --- */
......
......@@ -54,15 +54,13 @@ namespace dynamicgraph {
:public Task
,public EntityHelper<TaskWeight>
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
TaskWeight( const std::string& name );
public: /* --- ENTITY INHERITANCE --- */
static const std::string CLASS_NAME;
virtual const std::string& getClassName( void ) { return CLASS_NAME; }
virtual void display( std::ostream& os ) const;
public: /* --- SIGNALS --- */
......
......@@ -51,16 +51,14 @@ namespace dynamicgraph {
:public ::dynamicgraph::Entity
,public ::dynamicgraph::EntityHelper<ZmpEstimator>
{
DYNAMIC_GRAPH_ENTITY_DECL();
public: /* --- CONSTRUCTOR ---- */
ZmpEstimator( const std::string & name );
public: /* --- ENTITY INHERITANCE --- */
static const std::string CLASS_NAME;
virtual void display( std::ostream& os ) const;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
virtual void commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
......
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