diff --git a/include/hpp/manipulation/graph/graph.hh b/include/hpp/manipulation/graph/graph.hh index 5872d8f58d3bd620c25c1a5c2564b74bace0084c..b1780339be0a5ab5ee4e9eff07a6df62a03fb987 100644 --- a/include/hpp/manipulation/graph/graph.hh +++ b/include/hpp/manipulation/graph/graph.hh @@ -58,17 +58,25 @@ namespace hpp { /// \return The initialized projector. ConstraintSetPtr_t configConstraint (const Nodes_t& nodes); + /// Kept for compatibility. Do not use. Use configConstraint(const Edges_t&) instead + /// \param config Configuration that will initialize the projector. + /// \return The initialized constraint. + ConstraintSetPtr_t configConstraint (const Edges_t& edges, ConfigurationIn_t config) __attribute__ ((deprecated)); + /// Constraint to project onto the same leaf as config. /// \param edges a list of edges defining the foliation. - /// \param config Configuration that will initialize the projector. - /// \return The initialized projector. - ConstraintSetPtr_t configConstraint (const Edges_t& edges, ConfigurationIn_t config); + /// \return The constraint. + ConstraintSetPtr_t configConstraint (const Edges_t& edges); /// Constraint to project a path. /// \param edges a list of edges defining the foliation. + /// \return The constraint. + ConstraintSetPtr_t pathConstraint (const Edges_t& edges); + + /// Kept for compatibility. Do not use. Use pathConstraint(const Edges_t&) instead /// \param config Configuration that will initialize the constraint. /// \return The initialized constraint. - ConstraintSetPtr_t pathConstraint (const Edges_t& edges, ConfigurationIn_t config); + ConstraintSetPtr_t pathConstraint (const Edges_t& edges, ConfigurationIn_t config) __attribute__ ((deprecated)); /// Return the NodeSelector with the given name if any, /// NULL pointer if not found. diff --git a/src/graph/graph.cc b/src/graph/graph.cc index c763ca1dca405b96b486cabe5fce860a26f7492b..f3dfeb0a3b2147de83640d5ec2b528d4f778103b 100644 --- a/src/graph/graph.cc +++ b/src/graph/graph.cc @@ -194,6 +194,13 @@ namespace hpp { } ConstraintSetPtr_t Graph::configConstraint (const Edges_t& edges, ConfigurationIn_t config) + { + ConstraintSetPtr_t constraint = configConstraint (edges); + constraint->offsetFromConfig (config); + return constraint; + } + + ConstraintSetPtr_t Graph::configConstraint (const Edges_t& edges) { ConstraintSetPtr_t constraint; MapFromEdge::const_iterator it = cfgConstraintSetMapFromEdge_.find (edges); @@ -220,11 +227,17 @@ namespace hpp { constraint = it->second; } - constraint->offsetFromConfig (config); return constraint; } ConstraintSetPtr_t Graph::pathConstraint (const Edges_t& edges, ConfigurationIn_t config) + { + ConstraintSetPtr_t constraint = pathConstraint (edges); + constraint->offsetFromConfig (config); + return constraint; + } + + ConstraintSetPtr_t Graph::pathConstraint (const Edges_t& edges) { ConstraintSetPtr_t constraint; MapFromEdge::const_iterator it = pathConstraintSetMapFromEdge_.find (edges); @@ -247,7 +260,6 @@ namespace hpp { constraint = it->second; } - constraint->offsetFromConfig (config); return constraint; }