Skip to content
Snippets Groups Projects
Commit 1abba505 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Florent Lamiraux florent@laas.fr
Browse files

GraphOptimizer uses path validation of edge for optimization.

parent e5acf425
No related branches found
No related tags found
No related merge requests found
...@@ -38,7 +38,10 @@ namespace hpp { ...@@ -38,7 +38,10 @@ namespace hpp {
this->problem().pathValidation ()); this->problem().pathValidation ());
core::Problem p (problem().robot()); core::Problem p (problem().robot());
p.distance(problem().distance()); p.distance(problem().distance());
p.pathValidation(gpv->innerValidation()); // It should be ok to use the path validation of each edge because it
// corresponds to the global path validation minus the collision pairs
// disabled using the edge constraint.
// p.pathValidation(gpv->innerValidation());
p.pathProjector(problem().pathProjector()); p.pathProjector(problem().pathProjector());
path->flatten (expanded); path->flatten (expanded);
...@@ -72,6 +75,7 @@ namespace hpp { ...@@ -72,6 +75,7 @@ namespace hpp {
p.constraints(edge->steeringMethod()->constraints()); p.constraints(edge->steeringMethod()->constraints());
p.constraints()->configProjector()->rightHandSideFromConfig(toOpt->initial()); p.constraints()->configProjector()->rightHandSideFromConfig(toOpt->initial());
p.steeringMethod(edge->steeringMethod()); p.steeringMethod(edge->steeringMethod());
p.pathValidation(edge->pathValidation());
pathOptimizer_ = factory_ (p); pathOptimizer_ = factory_ (p);
toConcat = pathOptimizer_->optimize (toOpt); toConcat = pathOptimizer_->optimize (toOpt);
} }
......
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