Mod/Robot: Removed -Wreorder warnings.
This commit is contained in:
parent
7f0c5b5f23
commit
470880ebed
|
@ -25,9 +25,9 @@ namespace KDL {
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
Chain::Chain():
|
Chain::Chain():
|
||||||
segments(0),
|
|
||||||
nrOfJoints(0),
|
nrOfJoints(0),
|
||||||
nrOfSegments(0)
|
nrOfSegments(0),
|
||||||
|
segments(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,16 +27,16 @@ namespace KDL {
|
||||||
|
|
||||||
ChainDynParam::ChainDynParam(const Chain& _chain, Vector _grav):
|
ChainDynParam::ChainDynParam(const Chain& _chain, Vector _grav):
|
||||||
chain(_chain),
|
chain(_chain),
|
||||||
grav(_grav),
|
|
||||||
chainidsolver_coriolis( chain, Vector::Zero()),
|
|
||||||
chainidsolver_gravity( chain, grav),
|
|
||||||
nj(chain.getNrOfJoints()),
|
nj(chain.getNrOfJoints()),
|
||||||
ns(chain.getNrOfSegments()),
|
ns(chain.getNrOfSegments()),
|
||||||
|
grav(_grav),
|
||||||
jntarraynull(nj),
|
jntarraynull(nj),
|
||||||
|
chainidsolver_coriolis( chain, Vector::Zero()),
|
||||||
|
chainidsolver_gravity( chain, grav),
|
||||||
wrenchnull(ns,Wrench::Zero()),
|
wrenchnull(ns,Wrench::Zero()),
|
||||||
Ic(ns),
|
|
||||||
X(ns),
|
X(ns),
|
||||||
S(ns)
|
S(ns),
|
||||||
|
Ic(ns)
|
||||||
{
|
{
|
||||||
ag=-Twist(grav,Vector::Zero());
|
ag=-Twist(grav,Vector::Zero());
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,7 @@ namespace KDL
|
||||||
{
|
{
|
||||||
ChainIkSolverPos_NR::ChainIkSolverPos_NR(const Chain& _chain,ChainFkSolverPos& _fksolver,ChainIkSolverVel& _iksolver,
|
ChainIkSolverPos_NR::ChainIkSolverPos_NR(const Chain& _chain,ChainFkSolverPos& _fksolver,ChainIkSolverVel& _iksolver,
|
||||||
unsigned int _maxiter, double _eps):
|
unsigned int _maxiter, double _eps):
|
||||||
chain(_chain),fksolver(_fksolver),iksolver(_iksolver),delta_q(_chain.getNrOfJoints()),
|
chain(_chain),iksolver(_iksolver),fksolver(_fksolver),delta_q(_chain.getNrOfJoints()),
|
||||||
maxiter(_maxiter),eps(_eps)
|
maxiter(_maxiter),eps(_eps)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ namespace KDL
|
||||||
{
|
{
|
||||||
ChainIkSolverPos_NR_JL::ChainIkSolverPos_NR_JL(const Chain& _chain, const JntArray& _q_min, const JntArray& _q_max, ChainFkSolverPos& _fksolver,ChainIkSolverVel& _iksolver,
|
ChainIkSolverPos_NR_JL::ChainIkSolverPos_NR_JL(const Chain& _chain, const JntArray& _q_min, const JntArray& _q_max, ChainFkSolverPos& _fksolver,ChainIkSolverVel& _iksolver,
|
||||||
unsigned int _maxiter, double _eps):
|
unsigned int _maxiter, double _eps):
|
||||||
chain(_chain), q_min(chain.getNrOfJoints()), q_max(chain.getNrOfJoints()), fksolver(_fksolver),iksolver(_iksolver),delta_q(_chain.getNrOfJoints()),
|
chain(_chain), q_min(chain.getNrOfJoints()), q_max(chain.getNrOfJoints()), iksolver(_iksolver), fksolver(_fksolver),delta_q(_chain.getNrOfJoints()),
|
||||||
maxiter(_maxiter),eps(_eps)
|
maxiter(_maxiter),eps(_eps)
|
||||||
{
|
{
|
||||||
q_min = _q_min;
|
q_min = _q_min;
|
||||||
|
|
|
@ -34,8 +34,8 @@ namespace KDL
|
||||||
jac_eigen(m,n),
|
jac_eigen(m,n),
|
||||||
U(MatrixXd::Identity(m,m)),
|
U(MatrixXd::Identity(m,m)),
|
||||||
V(MatrixXd::Identity(n,n)),
|
V(MatrixXd::Identity(n,n)),
|
||||||
S(n),
|
|
||||||
B(m,n),
|
B(m,n),
|
||||||
|
S(n),
|
||||||
tempi(m),
|
tempi(m),
|
||||||
tempj(m),
|
tempj(m),
|
||||||
UY(VectorXd::Zero(6)),
|
UY(VectorXd::Zero(6)),
|
||||||
|
|
|
@ -36,8 +36,8 @@ namespace KDL
|
||||||
eps(_eps),
|
eps(_eps),
|
||||||
maxiter(_maxiter),
|
maxiter(_maxiter),
|
||||||
alpha(_alpha),
|
alpha(_alpha),
|
||||||
opt_pos(_opt_pos),
|
weights(_weights),
|
||||||
weights(_weights)
|
opt_pos(_opt_pos)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ namespace KDL {
|
||||||
// constructor for joint along arbitrary axis, at arbitrary origin
|
// constructor for joint along arbitrary axis, at arbitrary origin
|
||||||
Joint::Joint(const std::string& _name, const Vector& _origin, const Vector& _axis, const JointType& _type, const double& _scale,
|
Joint::Joint(const std::string& _name, const Vector& _origin, const Vector& _axis, const JointType& _type, const double& _scale,
|
||||||
const double& _offset, const double& _inertia, const double& _damping, const double& _stiffness):
|
const double& _offset, const double& _inertia, const double& _damping, const double& _stiffness):
|
||||||
name(_name), origin(_origin), axis(_axis / _axis.Norm()), type(_type),scale(_scale),offset(_offset),inertia(_inertia),damping(_damping),stiffness(_stiffness)
|
name(_name), type(_type),scale(_scale),offset(_offset),inertia(_inertia),damping(_damping),stiffness(_stiffness), axis(_axis / _axis.Norm()), origin(_origin)
|
||||||
{
|
{
|
||||||
if (type != RotAxis && type != TransAxis) throw joint_type_ex;
|
if (type != RotAxis && type != TransAxis) throw joint_type_ex;
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ namespace KDL {
|
||||||
// constructor for joint along arbitrary axis, at arbitrary origin
|
// constructor for joint along arbitrary axis, at arbitrary origin
|
||||||
Joint::Joint(const Vector& _origin, const Vector& _axis, const JointType& _type, const double& _scale,
|
Joint::Joint(const Vector& _origin, const Vector& _axis, const JointType& _type, const double& _scale,
|
||||||
const double& _offset, const double& _inertia, const double& _damping, const double& _stiffness):
|
const double& _offset, const double& _inertia, const double& _damping, const double& _stiffness):
|
||||||
name("NoName"), origin(_origin), axis(_axis / _axis.Norm()), type(_type),scale(_scale),offset(_offset),inertia(_inertia),damping(_damping),stiffness(_stiffness)
|
name("NoName"), type(_type),scale(_scale),offset(_offset),inertia(_inertia),damping(_damping),stiffness(_stiffness), axis(_axis / _axis.Norm()), origin(_origin)
|
||||||
{
|
{
|
||||||
if (type != RotAxis && type != TransAxis) throw joint_type_ex;
|
if (type != RotAxis && type != TransAxis) throw joint_type_ex;
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ namespace KDL{
|
||||||
const static bool mhi=true;
|
const static bool mhi=true;
|
||||||
|
|
||||||
RigidBodyInertia::RigidBodyInertia(double m_,const Vector& h_,const RotationalInertia& I_,bool mhi):
|
RigidBodyInertia::RigidBodyInertia(double m_,const Vector& h_,const RotationalInertia& I_,bool mhi):
|
||||||
m(m_),h(h_),I(I_)
|
m(m_),I(I_),h(h_)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ namespace KDL {
|
||||||
Frame pos;
|
Frame pos;
|
||||||
public:
|
public:
|
||||||
Trajectory_Stationary(double _duration,const Frame& _pos):
|
Trajectory_Stationary(double _duration,const Frame& _pos):
|
||||||
pos(_pos),duration(_duration) {}
|
duration(_duration),pos(_pos) {}
|
||||||
virtual double Duration() const {
|
virtual double Duration() const {
|
||||||
return duration;
|
return duration;
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@ namespace KDL {
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
Tree::Tree(const std::string& _root_name) :
|
Tree::Tree(const std::string& _root_name) :
|
||||||
nrOfSegments(0), nrOfJoints(0),root_name(_root_name) {
|
nrOfJoints(0),nrOfSegments(0),root_name(_root_name) {
|
||||||
segments.insert(make_pair(root_name, TreeElement::Root(root_name)));
|
segments.insert(make_pair(root_name, TreeElement::Root(root_name)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ namespace KDL {
|
||||||
TreeFkSolverPos& _fksolver, TreeIkSolverVel& _iksolver,
|
TreeFkSolverPos& _fksolver, TreeIkSolverVel& _iksolver,
|
||||||
unsigned int _maxiter, double _eps) :
|
unsigned int _maxiter, double _eps) :
|
||||||
tree(_tree), q_min(tree.getNrOfJoints()), q_max(tree.getNrOfJoints()),
|
tree(_tree), q_min(tree.getNrOfJoints()), q_max(tree.getNrOfJoints()),
|
||||||
fksolver(_fksolver), iksolver(_iksolver), delta_q(tree.getNrOfJoints()),
|
iksolver(_iksolver), fksolver(_fksolver), delta_q(tree.getNrOfJoints()),
|
||||||
endpoints(_endpoints), maxiter(_maxiter), eps(_eps) {
|
endpoints(_endpoints), maxiter(_maxiter), eps(_eps) {
|
||||||
|
|
||||||
q_min = _q_min;
|
q_min = _q_min;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user