Skip to content
Snippets Groups Projects
Commit 2d13ee96 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Move RoadmapNodes_t to namespace hpp::manipulation

parent 4f6977c0
No related branches found
No related tags found
No related merge requests found
......@@ -32,7 +32,6 @@ namespace hpp {
class HPP_MANIPULATION_DLLAPI ConnectedComponent : public core::ConnectedComponent
{
public:
typedef std::vector<RoadmapNodePtr_t> RoadmapNodes_t;
/// Map of graph nodes within the connected component
typedef std::map <graph::NodePtr_t, RoadmapNodes_t> GraphNodes_t;
......
......@@ -55,6 +55,7 @@ namespace hpp {
typedef boost::shared_ptr <Roadmap> RoadmapPtr_t;
HPP_PREDEF_CLASS (RoadmapNode);
typedef RoadmapNode* RoadmapNodePtr_t;
typedef std::vector<RoadmapNodePtr_t> RoadmapNodes_t;
HPP_PREDEF_CLASS (ConnectedComponent);
typedef boost::shared_ptr<ConnectedComponent> ConnectedComponentPtr_t;
HPP_PREDEF_CLASS (WeighedDistance);
......
......@@ -74,7 +74,7 @@ namespace hpp {
}
ConnectedComponent::RoadmapNodes_t ConnectedComponent::getRoadmapNodes (const graph::NodePtr_t graphNode)
RoadmapNodes_t ConnectedComponent::getRoadmapNodes (const graph::NodePtr_t graphNode)
{
RoadmapNodes_t res;
GraphNodes_t::iterator mapIt = graphNodeMap_.find(graphNode);
......
......@@ -83,9 +83,8 @@ namespace hpp {
{
core::NodePtr_t result = NULL;
minDistance = std::numeric_limits <value_type>::infinity ();
ConnectedComponent::RoadmapNodes_t roadmapNodes = connectedComponent->getRoadmapNodes (node);
for (ConnectedComponent::RoadmapNodes_t::const_iterator itNode =
roadmapNodes.begin ();
RoadmapNodes_t roadmapNodes = connectedComponent->getRoadmapNodes (node);
for (RoadmapNodes_t::const_iterator itNode = roadmapNodes.begin ();
itNode != roadmapNodes.end (); ++itNode) {
value_type d = (*distance()) (*(*itNode)->configuration (),
*configuration);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment