Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
pinocchio
Commits
5a0e1015
Verified
Commit
5a0e1015
authored
Aug 09, 2019
by
Justin Carpentier
Browse files
algo: use new actInv of SE3 on Constraint
parent
fbb1cc37
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/algorithm/aba.hxx
View file @
5a0e1015
...
...
@@ -135,10 +135,9 @@ namespace pinocchio
typedef
typename
PINOCCHIO_EIGEN_PLAIN_TYPE
(
Matrix6Type
)
ReturnType
;
const
SE3
Minv
=
M
.
inverse
();
typename
SE3
::
ActionMatrixType
dual_action_matrix
(
M
.
toDualActionMatrix
());
typename
SE3
::
ActionMatrixType
action_matrix
(
M
inv
.
toActionMatrix
());
ReturnType
intermediate_result
(
dual_action_matrix
*
I
)
;
typename
SE3
::
ActionMatrixType
action_matrix
(
M
.
toActionMatrix
Inverse
());
ReturnType
intermediate_result
=
dual_action_matrix
*
I
;
ReturnType
res
=
intermediate_result
*
action_matrix
;
return
res
;
}
...
...
src/algorithm/jacobian.hxx
View file @
5a0e1015
...
...
@@ -189,7 +189,7 @@ namespace pinocchio
data
.
iMf
[
parent
]
=
data
.
liMi
[
i
]
*
data
.
iMf
[
i
];
Matrix6xLike
&
J_
=
PINOCCHIO_EIGEN_CONST_CAST
(
Matrix6xLike
,
J
);
jmodel
.
jointCols
(
J_
)
=
data
.
iMf
[
i
].
inverse
().
act
(
jdata
.
S
());
// TODO: overload actInv
jmodel
.
jointCols
(
J_
)
=
data
.
iMf
[
i
].
actInv
(
jdata
.
S
());
}
};
...
...
src/multibody/joint/joint-composite.hxx
View file @
5a0e1015
...
...
@@ -46,7 +46,7 @@ namespace pinocchio
const
int
idx_v
=
model
.
m_idx_v
[
i
]
-
model
.
m_idx_v
[
0
];
data
.
iMlast
[
i
]
=
data
.
pjMi
[
i
]
*
data
.
iMlast
[
succ
];
data
.
S
.
matrix
().
middleCols
(
idx_v
,
model
.
m_nvs
[
i
])
=
data
.
iMlast
[
succ
].
inverse
().
act
(
jdata
.
S
());
// TODO: avoid computing inverse
data
.
S
.
matrix
().
middleCols
(
idx_v
,
model
.
m_nvs
[
i
])
=
data
.
iMlast
[
succ
].
actInv
(
jdata
.
S
());
}
}
...
...
@@ -112,7 +112,7 @@ namespace pinocchio
const
int
idx_v
=
model
.
m_idx_v
[
i
]
-
model
.
m_idx_v
[
0
];
data
.
iMlast
[
i
]
=
data
.
pjMi
[
i
]
*
data
.
iMlast
[
succ
];
data
.
S
.
matrix
().
middleCols
(
idx_v
,
model
.
m_nvs
[
i
])
=
data
.
iMlast
[
succ
].
inverse
().
act
(
jdata
.
S
());
// TODO: avoid computing inverse
data
.
S
.
matrix
().
middleCols
(
idx_v
,
model
.
m_nvs
[
i
])
=
data
.
iMlast
[
succ
].
actInv
(
jdata
.
S
());
typename
JointModelComposite
::
Motion
v_tmp
=
data
.
iMlast
[
succ
].
actInv
(
jdata
.
v
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment