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
9daceeca
Commit
9daceeca
authored
9 years ago
by
Valenza Florian
Browse files
Options
Downloads
Patches
Plain Diff
[FixBug][C++]Fixed compilation errors dur to change in API
parent
3054137b
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
benchmark/timings-geometry.cpp
+1
-1
1 addition, 1 deletion
benchmark/timings-geometry.cpp
unittest/geom.cpp
+4
-4
4 additions, 4 deletions
unittest/geom.cpp
with
5 additions
and
5 deletions
benchmark/timings-geometry.cpp
+
1
−
1
View file @
9daceeca
...
...
@@ -182,7 +182,7 @@ hpp::model::HumanoidRobotPtr_t humanoidRobot =
timer
.
tic
();
SMOOTH
(
NBT
)
{
update
CollisionGeometry
(
romeo_model
,
romeo_data
,
romeo_model_geom
,
romeo_data_geom
,
qs_romeo_pino
[
_smooth
]
,
true
);
update
GeometryPlacements
(
romeo_model
,
romeo_data
,
romeo_model_geom
,
romeo_data_geom
,
qs_romeo_pino
[
_smooth
]);
}
double
compute_forward_kinematics_time
=
timer
.
toc
(
StackTicToc
::
US
)
/
NBT
;
std
::
cout
<<
"Update Collision Geometry < true > (K) =
\t
"
<<
compute_forward_kinematics_time
<<
" "
<<
StackTicToc
::
unitName
(
StackTicToc
::
US
)
<<
std
::
endl
;
...
...
This diff is collapsed.
Click to expand it.
unittest/geom.cpp
+
4
−
4
View file @
9daceeca
...
...
@@ -330,7 +330,7 @@ BOOST_AUTO_TEST_CASE ( hrp2_mesh_distance)
/// ********** Pinocchio ********** ///
/// ********************************* ///
/// ********************************* ///
// Building the model in pinocchio and compute kinematics/geometry for configuration q_pino
std
::
string
filename
=
PINOCCHIO_SOURCE_DIR
"/models/romeo.urdf"
;
...
...
@@ -399,10 +399,10 @@ BOOST_AUTO_TEST_CASE ( hrp2_mesh_distance)
std
::
cout
<<
"comparison between "
<<
body1
<<
" and "
<<
body2
<<
std
::
endl
;
fcl
::
DistanceResult
dist_pin
=
data_geom
.
computeDistance
(
robot
.
second
.
getGeomId
(
body1
),
se3
::
DistanceResult
dist_pin
=
data_geom
.
computeDistance
(
robot
.
second
.
getGeomId
(
body1
),
robot
.
second
.
getGeomId
(
body2
));
Distance_t
distance_pin
(
dist_pin
);
Distance_t
distance_pin
(
dist_pin
.
fcl_distance_result
);
distance_hpp
.
checkClose
(
distance_pin
);
}
}
...
...
@@ -415,7 +415,7 @@ BOOST_AUTO_TEST_SUITE_END ()
JointPositionsMap_t
fillPinocchioJointPositions
(
const
se3
::
Data
&
data
)
{
JointPositionsMap_t
result
;
for
(
int
i
=
0
;
i
<
data
.
model
.
nbody
;
++
i
)
for
(
se3
::
Model
::
Index
i
=
0
;
i
<
(
se3
::
Model
::
Index
)
data
.
model
.
nbody
;
++
i
)
{
result
[
data
.
model
.
getJointName
(
i
)]
=
data
.
oMi
[
i
];
}
...
...
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