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
75e20e07
Verified
Commit
75e20e07
authored
6 years ago
by
Joseph Mirabel
Committed by
Justin Carpentier
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[SRDF] Fix initialization of reference configurations.
parent
2b490867
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/parsers/srdf.hxx
+11
-9
11 additions, 9 deletions
src/parsers/srdf.hxx
with
11 additions
and
9 deletions
src/parsers/srdf.hxx
+
11
−
9
View file @
75e20e07
...
...
@@ -321,15 +321,8 @@ namespace pinocchio
if
(
v
.
first
==
"group_state"
)
{
const
std
::
string
name
=
v
.
second
.
get
<
std
::
string
>
(
"<xmlattr>.name"
);
if
(
!
model
.
referenceConfigurations
.
insert
(
std
::
make_pair
(
name
,
Model
::
ConfigVectorType
::
Zero
(
model
.
nq
))).
second
)
{
// Element already present...
if
(
verbose
)
std
::
cout
<<
"The reference configuration "
<<
name
<<
" has been defined multiple times. "
<<
"Only the last instance of "
<<
name
<<
" is being used."
<<
std
::
endl
;
}
typename
Model
::
ConfigVectorType
&
ref_config
=
model
.
referenceConfigurations
.
find
(
name
)
->
second
;
typename
Model
::
ConfigVectorType
ref_config
(
model
.
nq
);
neutral
(
model
,
ref_config
);
// Iterate over all the joint tags
BOOST_FOREACH
(
const
ptree
::
value_type
&
joint_tag
,
v
.
second
)
...
...
@@ -361,6 +354,15 @@ namespace pinocchio
}
}
if
(
!
model
.
referenceConfigurations
.
insert
(
std
::
make_pair
(
name
,
ref_config
)).
second
)
{
// Element already present...
if
(
verbose
)
std
::
cout
<<
"The reference configuration "
<<
name
<<
" has been defined multiple times. "
<<
"Only the last instance of "
<<
name
<<
" is being used."
<<
std
::
endl
;
}
}
}
// BOOST_FOREACH
}
...
...
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