Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hpp-manipulation
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
Humanoid Path Planner
hpp-manipulation
Commits
27609aaa
Commit
27609aaa
authored
9 years ago
by
Akseppal
Browse files
Options
Downloads
Patches
Plain Diff
Corrected manipulation::ConnectedComponent::addNode argument. Compiles and runs.
parent
e39cec45
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
include/hpp/manipulation/connected-component.hh
+1
-1
1 addition, 1 deletion
include/hpp/manipulation/connected-component.hh
src/connected-component.cc
+6
-5
6 additions, 5 deletions
src/connected-component.cc
with
7 additions
and
6 deletions
include/hpp/manipulation/connected-component.hh
+
1
−
1
View file @
27609aaa
...
...
@@ -55,7 +55,7 @@ class HPP_MANIPULATION_DLLAPI ConnectedComponent : public core::ConnectedCompone
/// Add roadmap node to connected component
/// \param roadmap node to be added
void
addNode
(
const
Roadmap
NodePtr_t
&
node
);
void
addNode
(
const
core
::
NodePtr_t
&
node
);
RoadmapNodes_t
getRoadmapNodes
(
const
graph
::
NodePtr_t
graphNode
);
...
...
This diff is collapsed.
Click to expand it.
src/connected-component.cc
+
6
−
5
View file @
27609aaa
...
...
@@ -61,19 +61,20 @@ namespace hpp {
other
->
graphNodeMap_
.
clear
();
}
void
ConnectedComponent
::
addNode
(
const
Roadmap
NodePtr_t
&
node
)
void
ConnectedComponent
::
addNode
(
const
core
::
NodePtr_t
&
node
)
{
core
::
ConnectedComponent
::
addNode
(
node
);
// Find right graph node in map and add roadmap node to corresponding vector
GraphNodes_t
::
iterator
mapIt
=
graphNodeMap_
.
find
(
roadmap_
->
getNode
(
node
));
const
RoadmapNodePtr_t
&
n
=
static_cast
<
const
RoadmapNodePtr_t
>
(
node
);
GraphNodes_t
::
iterator
mapIt
=
graphNodeMap_
.
find
(
roadmap_
->
getNode
(
n
));
if
(
mapIt
!=
graphNodeMap_
.
end
())
{
mapIt
->
second
.
push_back
(
n
ode
);
mapIt
->
second
.
push_back
(
n
);
// if graph node not found, add new map element with one roadmap node
}
else
{
RoadmapNodes_t
newRoadmapNodeVector
;
newRoadmapNodeVector
.
push_back
(
n
ode
);
newRoadmapNodeVector
.
push_back
(
n
);
graphNodeMap_
.
insert
(
std
::
pair
<
graph
::
NodePtr_t
,
RoadmapNodes_t
>
(
roadmap_
->
getNode
(
n
ode
),
newRoadmapNodeVector
));
(
roadmap_
->
getNode
(
n
),
newRoadmapNodeVector
));
}
}
...
...
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