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
4213fa3a
Commit
4213fa3a
authored
9 years ago
by
jcarpent
Browse files
Options
Downloads
Patches
Plain Diff
[C++] Add missing inline
parent
7e1224f4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/algorithm/center-of-mass.hpp
+9
-9
9 additions, 9 deletions
src/algorithm/center-of-mass.hpp
src/algorithm/center-of-mass.hxx
+5
-5
5 additions, 5 deletions
src/algorithm/center-of-mass.hxx
with
14 additions
and
14 deletions
src/algorithm/center-of-mass.hpp
+
9
−
9
View file @
4213fa3a
...
...
@@ -37,7 +37,7 @@ namespace se3
///
/// \return The center of mass position of the rigid body system expressed in the world frame (vector 3).
///
const
Eigen
::
Vector3d
&
inline
const
Eigen
::
Vector3d
&
centerOfMass
(
const
Model
&
model
,
Data
&
data
,
const
Eigen
::
VectorXd
&
q
,
const
bool
&
computeSubtreeComs
=
true
);
...
...
@@ -54,11 +54,11 @@ namespace se3
/// \param[in] a The joint acceleration vector (dim model.nv).
/// \param[in] computeSubtreeComs If true, the algorithm computes also the center of mass of the subtrees.
///
void
centerOfMassAcceleration
(
const
Model
&
model
,
Data
&
data
,
const
Eigen
::
VectorXd
&
q
,
const
Eigen
::
VectorXd
&
v
,
const
Eigen
::
VectorXd
&
a
,
const
bool
&
computeSubtreeComs
=
true
);
inline
void
centerOfMassAcceleration
(
const
Model
&
model
,
Data
&
data
,
const
Eigen
::
VectorXd
&
q
,
const
Eigen
::
VectorXd
&
v
,
const
Eigen
::
VectorXd
&
a
,
const
bool
&
computeSubtreeComs
=
true
);
///
/// \brief Computes both the jacobian and the the center of mass position of a given model according to a particular joint configuration.
...
...
@@ -72,7 +72,7 @@ namespace se3
///
/// \return The jacobian of center of mass position of the rigid body system expressed in the world frame (matrix 3 x model.nv).
///
const
Eigen
::
Matrix
<
double
,
3
,
Eigen
::
Dynamic
>
&
inline
const
Eigen
::
Matrix
<
double
,
3
,
Eigen
::
Dynamic
>
&
jacobianCenterOfMass
(
const
Model
&
model
,
Data
&
data
,
const
Eigen
::
VectorXd
&
q
,
const
bool
&
computeSubtreeComs
=
true
);
...
...
@@ -89,7 +89,7 @@ namespace se3
///
/// \return The center of mass position of the rigid body system expressed in the world frame (vector 3).
///
const
Eigen
::
Vector3d
&
inline
const
Eigen
::
Vector3d
&
getComFromCrba
(
const
Model
&
model
,
Data
&
data
);
///
...
...
@@ -101,7 +101,7 @@ namespace se3
///
/// \return The jacobian of the CoM expressed in the world frame (matrix 3 x model.nv).
///
const
Eigen
::
Matrix
<
double
,
3
,
Eigen
::
Dynamic
>
&
inline
const
Eigen
::
Matrix
<
double
,
3
,
Eigen
::
Dynamic
>
&
getJacobianComFromCrba
(
const
Model
&
model
,
Data
&
data
);
}
// namespace se3
...
...
This diff is collapsed.
Click to expand it.
src/algorithm/center-of-mass.hxx
+
5
−
5
View file @
4213fa3a
...
...
@@ -59,7 +59,7 @@ namespace se3
};
/* Compute the centerOfMass in the local frame of the root joint. */
const
Eigen
::
Vector3d
&
inline
const
Eigen
::
Vector3d
&
centerOfMass
(
const
Model
&
model
,
Data
&
data
,
const
Eigen
::
VectorXd
&
q
,
const
bool
&
computeSubtreeComs
)
...
...
@@ -89,7 +89,7 @@ namespace se3
}
/* Compute the centerOfMass position, velocity and acceleration in the local frame of the root joint. */
void
inline
void
centerOfMassAcceleration
(
const
Model
&
model
,
Data
&
data
,
const
Eigen
::
VectorXd
&
q
,
const
Eigen
::
VectorXd
&
v
,
...
...
@@ -147,7 +147,7 @@ namespace se3
data
.
acom
[
0
]
/=
data
.
mass
[
0
];
}
const
Eigen
::
Vector3d
&
getComFromCrba
(
const
Model
&
,
Data
&
data
)
inline
const
Eigen
::
Vector3d
&
getComFromCrba
(
const
Model
&
,
Data
&
data
)
{
return
data
.
com
[
0
]
=
data
.
liMi
[
1
].
act
(
data
.
Ycrb
[
1
].
lever
());
}
...
...
@@ -235,7 +235,7 @@ namespace se3
};
const
Eigen
::
Matrix
<
double
,
3
,
Eigen
::
Dynamic
>
&
inline
const
Eigen
::
Matrix
<
double
,
3
,
Eigen
::
Dynamic
>
&
jacobianCenterOfMass
(
const
Model
&
model
,
Data
&
data
,
const
Eigen
::
VectorXd
&
q
,
const
bool
&
computeSubtreeComs
)
...
...
@@ -260,7 +260,7 @@ namespace se3
return
data
.
Jcom
;
}
const
Eigen
::
Matrix
<
double
,
3
,
Eigen
::
Dynamic
>
&
inline
const
Eigen
::
Matrix
<
double
,
3
,
Eigen
::
Dynamic
>
&
getJacobianComFromCrba
(
const
Model
&
,
Data
&
data
)
{
const
SE3
&
oM1
=
data
.
liMi
[
1
];
...
...
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