Skip to content
Snippets Groups Projects
Commit 0b9cc55a authored by Francois Bleibel's avatar Francois Bleibel
Browse files

Corrected typo in op-point-modifier.

parent 8631fd14
No related branches found
No related tags found
Loading
...@@ -34,13 +34,13 @@ namespace ml = maal::boost; ...@@ -34,13 +34,13 @@ namespace ml = maal::boost;
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
#if defined (WIN32) #if defined (WIN32)
# if defined (sotOpPointModifior_EXPORTS) # if defined (OpPointModifier_EXPORTS)
# define SOTOPPOINTMODIFIOR_EXPORT __declspec(dllexport) # define SOTOPPOINTMODIFIER_EXPORT __declspec(dllexport)
# else # else
# define SOTOPPOINTMODIFIOR_EXPORT __declspec(dllimport) # define SOTOPPOINTMODIFIER_EXPORT __declspec(dllimport)
# endif # endif
#else #else
# define SOTOPPOINTMODIFIOR_EXPORT # define SOTOPPOINTMODIFIER_EXPORT
#endif #endif
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
...@@ -50,7 +50,7 @@ namespace ml = maal::boost; ...@@ -50,7 +50,7 @@ namespace ml = maal::boost;
namespace sot { namespace sot {
namespace dg = dynamicgraph; namespace dg = dynamicgraph;
class SOTOPPOINTMODIFIOR_EXPORT OpPointModifior class SOTOPPOINTMODIFIER_EXPORT OpPointModifier
: public dg::Entity : public dg::Entity
{ {
public: public:
...@@ -68,9 +68,9 @@ class SOTOPPOINTMODIFIOR_EXPORT OpPointModifior ...@@ -68,9 +68,9 @@ class SOTOPPOINTMODIFIOR_EXPORT OpPointModifior
dg::SignalTimeDependent<MatrixHomogeneous,int> positionSOUT; dg::SignalTimeDependent<MatrixHomogeneous,int> positionSOUT;
public: public:
OpPointModifior( const std::string& name ); OpPointModifier( const std::string& name );
virtual ~OpPointModifior( void ){} virtual ~OpPointModifier( void ){}
ml::Matrix& computeJacobian( ml::Matrix& res,const int& time ); ml::Matrix& computeJacobian( ml::Matrix& res,const int& time );
MatrixHomogeneous& computePosition( MatrixHomogeneous& res,const int& time ); MatrixHomogeneous& computePosition( MatrixHomogeneous& res,const int& time );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright Projet JRL-Japan, 2007 * Copyright Projet JRL-Japan, 2007
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ *+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
* *
* File: OpPointModifior.cp * File: OpPointModifier.cp
* Project: SOT * Project: SOT
* Author: Nicolas Mansard * Author: Nicolas Mansard
* *
...@@ -30,23 +30,23 @@ using namespace sot; ...@@ -30,23 +30,23 @@ using namespace sot;
using namespace dynamicgraph; using namespace dynamicgraph;
SOT_FACTORY_ENTITY_PLUGIN(OpPointModifior,"OpPointModifior"); SOT_FACTORY_ENTITY_PLUGIN(OpPointModifier,"OpPointModifior");
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
OpPointModifior:: OpPointModifier::
OpPointModifior( const std::string& name ) OpPointModifier( const std::string& name )
:Entity( name ) :Entity( name )
,transformation() ,transformation()
,jacobianSIN(NULL,"OpPointModifior("+name+")::input(matrix)::jacobianIN") ,jacobianSIN(NULL,"OpPointModifior("+name+")::input(matrix)::jacobianIN")
,positionSIN(NULL,"OpPointModifior("+name+")::input(matrixhomo)::positionIN") ,positionSIN(NULL,"OpPointModifior("+name+")::input(matrixhomo)::positionIN")
,jacobianSOUT( boost::bind(&OpPointModifior::computeJacobian,this,_1,_2), ,jacobianSOUT( boost::bind(&OpPointModifier::computeJacobian,this,_1,_2),
jacobianSIN, jacobianSIN,
"OpPointModifior("+name+")::output(matrix)::jacobian" ) "OpPointModifior("+name+")::output(matrix)::jacobian" )
,positionSOUT( boost::bind(&OpPointModifior::computePosition,this,_1,_2), ,positionSOUT( boost::bind(&OpPointModifier::computePosition,this,_1,_2),
jacobianSIN, jacobianSIN,
"OpPointModifior("+name+")::output(matrixhomo)::position" ) "OpPointModifior("+name+")::output(matrixhomo)::position" )
...@@ -57,7 +57,7 @@ OpPointModifior( const std::string& name ) ...@@ -57,7 +57,7 @@ OpPointModifior( const std::string& name )
} }
ml::Matrix& ml::Matrix&
OpPointModifior::computeJacobian( ml::Matrix& res,const int& time ) OpPointModifier::computeJacobian( ml::Matrix& res,const int& time )
{ {
const ml::Matrix& jacobian = jacobianSIN( time ); const ml::Matrix& jacobian = jacobianSIN( time );
MatrixTwist V( transformation ); MatrixTwist V( transformation );
...@@ -66,7 +66,7 @@ OpPointModifior::computeJacobian( ml::Matrix& res,const int& time ) ...@@ -66,7 +66,7 @@ OpPointModifior::computeJacobian( ml::Matrix& res,const int& time )
} }
MatrixHomogeneous& MatrixHomogeneous&
OpPointModifior::computePosition( MatrixHomogeneous& res,const int& time ) OpPointModifier::computePosition( MatrixHomogeneous& res,const int& time )
{ {
sotDEBUGIN(15); sotDEBUGIN(15);
sotDEBUGIN(15) << time << " " << positionSIN.getTime() << positionSOUT.getTime() << endl; sotDEBUGIN(15) << time << " " << positionSIN.getTime() << positionSOUT.getTime() << endl;
...@@ -77,11 +77,11 @@ OpPointModifior::computePosition( MatrixHomogeneous& res,const int& time ) ...@@ -77,11 +77,11 @@ OpPointModifior::computePosition( MatrixHomogeneous& res,const int& time )
} }
void void
OpPointModifior::setTransformation( const MatrixHomogeneous& tr ) OpPointModifier::setTransformation( const MatrixHomogeneous& tr )
{ transformation = tr; } { transformation = tr; }
void OpPointModifior:: void OpPointModifier::
commandLine( const std::string& cmdLine, commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs, std::istringstream& cmdArgs,
std::ostream& os ) std::ostream& os )
......
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