Skip to content
Snippets Groups Projects
Commit 9e8074b6 authored by Romano Hauser's avatar Romano Hauser
Browse files

add bool state isRelationFixed in getJacobianMatrix

parent e2801c29
Branches
Tags
No related merge requests found
......@@ -55,11 +55,11 @@ namespace tf {
////////////////////////////////////////////////////////////////////////////////
//// Jacobi Matrix for TrafoMatrix
virtual Matrix<6,6,double> getJacobiMatrix();
virtual Matrix<6,6,double> getJacobiMatrix(bool isRelationFixed = true );
/////////////////////////////////////////////////////////////////////////////////
//// Jacobi Matrix for TrafoMatrix as static method for general use:
static Matrix<6,6,double> getJacobiMatrix(Matrix<4,4,double> _tf);
static Matrix<6,6,double> getJacobiMatrix(Matrix<4,4,double> _tf, bool isRelationFixed= true );
/////////////////////////////////////////////////////////////////////////////////
//// inverse matrix
......
......@@ -100,7 +100,7 @@ namespace tf {
////////////////////////////////////////////////////////////////////////////////
//// Jacobi Matrix for TrafoMatrix
eeros::math::Matrix<6,6,double> TrafoMatrix::getJacobiMatrix(){
eeros::math::Matrix<6,6,double> TrafoMatrix::getJacobiMatrix(bool isRelationFixed ){
eeros::math::Matrix<6,6,double> jacobian;
jacobian.zero();
......@@ -114,7 +114,9 @@ namespace tf {
for(int j=0; j<3; j++){ // row
jacobian(j,i)= get(j,i); // links oben
jacobian(j+3,i+3)= get(j,i); // rechts unten
jacobian(j, i+3) = crossP(j); // rechts oben
if (isRelationFixed){
jacobian(j, i+3) = crossP(j); // rechts oben
}
}
}
return jacobian;
......@@ -124,7 +126,7 @@ namespace tf {
/////////////////////////////////////////////////////////////////////////////////
//// Jacobi Matrix for TrafoMatrix as static method for general use:
eeros::math::Matrix<6,6,double> TrafoMatrix::getJacobiMatrix(eeros::math::Matrix<4,4,double> _tf){
eeros::math::Matrix<6,6,double> TrafoMatrix::getJacobiMatrix(eeros::math::Matrix<4,4,double> _tf, bool isRelationFixed ){
eeros::math::Matrix<6,6,double> jacobian;
jacobian.zero();
......@@ -138,7 +140,9 @@ namespace tf {
for(int j=0; j<3; j++){ // row
jacobian(j,i)= _tf(j,i); // links oben
jacobian(j+3,i+3)= _tf(j,i); // rechts unten
jacobian(j, i+3) = crossP(j); // rechts oben
if (isRelationFixed){
jacobian(j, i+3) = crossP(j); // rechts oben
}
}
}
return jacobian;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment