Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pinocchio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stack Of Tasks
pinocchio
Commits
e1415dbf
Commit
e1415dbf
authored
7 years ago
by
jcarpent
Browse files
Options
Downloads
Patches
Plain Diff
[Model] Use RowMatrix instead of MatrixR naming for Row major matrices
parent
26bd1fa6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/algorithm/rnea.hxx
+2
-2
2 additions, 2 deletions
src/algorithm/rnea.hxx
src/multibody/model.hpp
+2
-2
2 additions, 2 deletions
src/multibody/model.hpp
with
4 additions
and
4 deletions
src/algorithm/rnea.hxx
+
2
−
2
View file @
e1415dbf
...
...
@@ -194,7 +194,7 @@ namespace se3
const
Model
::
JointIndex
&
parent
=
model
.
parents
[
i
];
jmodel
.
jointVelocitySelector
(
data
.
nle
)
=
jdata
.
S
().
transpose
()
*
data
.
f
[
i
];
if
(
parent
>
0
)
data
.
f
[
(
size_t
)
parent
]
+=
data
.
liMi
[
i
].
act
(
data
.
f
[
i
]);
if
(
parent
>
0
)
data
.
f
[
parent
]
+=
data
.
liMi
[
i
].
act
(
data
.
f
[
i
]);
}
};
...
...
@@ -361,7 +361,7 @@ namespace se3
{
const
Model
::
JointIndex
&
i
=
jmodel
.
id
();
const
Model
::
JointIndex
&
parent
=
model
.
parents
[
i
];
Data
::
Matrix6
R
&
M6tmpR
=
data
.
M6tmpR
;
Data
::
Row
Matrix6
&
M6tmpR
=
data
.
M6tmpR
;
typedef
typename
SizeDepType
<
JointModel
::
NV
>::
template
ColsReturn
<
Data
::
Matrix6x
>
::
Type
ColsBlock
;
ColsBlock
dJcols
=
jmodel
.
jointCols
(
data
.
dJ
);
...
...
This diff is collapsed.
Click to expand it.
src/multibody/model.hpp
+
2
−
2
View file @
e1415dbf
...
...
@@ -359,7 +359,7 @@ namespace se3
typedef
Eigen
::
Matrix
<
double
,
3
,
Eigen
::
Dynamic
>
Matrix3x
;
typedef
SE3
::
Vector3
Vector3
;
typedef
Eigen
::
Matrix
<
double
,
6
,
6
,
Eigen
::
RowMajor
>
Matrix6
R
;
typedef
Eigen
::
Matrix
<
double
,
6
,
6
,
Eigen
::
RowMajor
>
Row
Matrix6
;
/// \brief Vector of se3::JointData associated to the se3::JointModel stored in model,
/// encapsulated in JointDataAccessor.
JointDataVector
joints
;
...
...
@@ -453,7 +453,7 @@ namespace se3
Inertia
::
Matrix6
Itmp
;
/// \brief Temporary for derivative algorithms
Matrix6
R
M6tmpR
;
Row
Matrix6
M6tmpR
;
/// \brief The joint accelerations computed from ABA
Eigen
::
VectorXd
ddq
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment