Moved the .h in the source, and added the namespace dynamicgraph.

include/sot-dyninv/task-dyn-pd.h → src/task-dyn-pd.h

@@ -38,56 +38,56 @@
 /* SOT */
 #include <sot-dyninv/signal-helper.h>
 #include <sot-dyninv/entity-helper.h>
-#include <sot-core/task.h>
+#include <sot/core/task.hh>
 
+namespace dynamicgraph {
+  namespace sot {
+    namespace dyninv {
 
-namespace sot {
-  namespace dyninv {
+      /* --------------------------------------------------------------------- */
+      /* --- CLASS ----------------------------------------------------------- */
+      /* --------------------------------------------------------------------- */
 
-  /* --------------------------------------------------------------------- */
-  /* --- CLASS ----------------------------------------------------------- */
-  /* --------------------------------------------------------------------- */
 
+      class SOTTASKDYNPD_EXPORT TaskDynPD
+	:public ::dynamicgraph::sot::Task
+	,public ::dynamicgraph::EntityHelper<TaskDynPD>
+	{
 
-  class SOTTASKDYNPD_EXPORT TaskDynPD
-    :public ::sot::Task
-      ,public ::dynamicgraph::EntityHelper<TaskDynPD>
-      {
+	public: /* --- CONSTRUCTOR ---- */
 
-      public: /* --- CONSTRUCTOR ---- */
+	  TaskDynPD( const std::string & name );
 
-	TaskDynPD( const std::string & name );
+	public: /* --- ENTITY INHERITANCE --- */
 
-      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; }
 
-	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 --- */
 
-      public:  /* --- SIGNALS --- */
+	  DECLARE_SIGNAL_IN(Kv,double);
+	  DECLARE_SIGNAL_IN(qdot,ml::Vector);
+	  DECLARE_SIGNAL_IN(dt,double);
 
-	DECLARE_SIGNAL_IN(Kv,double);
-	DECLARE_SIGNAL_IN(qdot,ml::Vector);
-	DECLARE_SIGNAL_IN(dt,double);
+	  DECLARE_SIGNAL_OUT(errorDot,ml::Vector);
+	  DECLARE_SIGNAL_OUT(KvAuto,double);
+	  DECLARE_SIGNAL_OUT(Jdot,ml::Matrix);
+	  DECLARE_SIGNAL_OUT(taskVector,ml::Vector);
 
-	DECLARE_SIGNAL_OUT(errorDot,ml::Vector);
-	DECLARE_SIGNAL_OUT(KvAuto,double);
-	DECLARE_SIGNAL_OUT(Jdot,ml::Matrix);
-	DECLARE_SIGNAL_OUT(taskVector,ml::Vector);
+	protected:
+	  dynamicgraph::sot::VectorMultiBound&
+	    taskSOUT_function( dynamicgraph::sot::VectorMultiBound& task,int iter );
 
-      protected:
-	sot::VectorMultiBound&
-	  taskSOUT_function( sot::VectorMultiBound& task,int iter );
+	protected:
+	  ml::Matrix previousJ;
+	  bool previousJset;
 
-      protected:
-	ml::Matrix previousJ;
-	bool previousJset;
-
-      }; // class TaskDynPD
-
-  } // namespace dyninv
-} // namespace sot
+	}; // class TaskDynPD
 
+    } // namespace dyninv
+  } // namespace sot
+} // namespace dynamicgraph
 
 
 #endif // #ifndef __sot_dyninv_TaskDynPD_H__