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
c3a7ef4b
Commit
c3a7ef4b
authored
7 years ago
by
Joseph Mirabel
Committed by
Florent Lamiraux florent@laas.fr
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix GraphOptimizer: it was modify the constraint of an edge steering method.
parent
1abba505
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/graph-optimizer.cc
+9
-9
9 additions, 9 deletions
src/graph-optimizer.cc
with
9 additions
and
9 deletions
src/graph-optimizer.cc
+
9
−
9
View file @
c3a7ef4b
...
@@ -36,13 +36,6 @@ namespace hpp {
...
@@ -36,13 +36,6 @@ namespace hpp {
toConcat
;
toConcat
;
GraphPathValidationPtr_t
gpv
=
HPP_DYNAMIC_PTR_CAST
(
GraphPathValidation
,
GraphPathValidationPtr_t
gpv
=
HPP_DYNAMIC_PTR_CAST
(
GraphPathValidation
,
this
->
problem
().
pathValidation
());
this
->
problem
().
pathValidation
());
core
::
Problem
p
(
problem
().
robot
());
p
.
distance
(
problem
().
distance
());
// 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
());
path
->
flatten
(
expanded
);
path
->
flatten
(
expanded
);
ConstraintSetPtr_t
c
;
ConstraintSetPtr_t
c
;
...
@@ -72,9 +65,16 @@ namespace hpp {
...
@@ -72,9 +65,16 @@ namespace hpp {
if
(
isShort
)
if
(
isShort
)
toConcat
=
toOpt
;
toConcat
=
toOpt
;
else
{
else
{
p
.
constraints
(
edge
->
steeringMethod
()
->
constraints
());
core
::
Problem
p
(
problem
().
robot
());
p
.
distance
(
problem
().
distance
());
// 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
.
steeringMethod
(
edge
->
steeringMethod
()
->
copy
());
p
.
constraints
(
p
.
steeringMethod
()
->
constraints
());
p
.
constraints
()
->
configProjector
()
->
rightHandSideFromConfig
(
toOpt
->
initial
());
p
.
constraints
()
->
configProjector
()
->
rightHandSideFromConfig
(
toOpt
->
initial
());
p
.
steeringMethod
(
edge
->
steeringMethod
());
p
.
pathValidation
(
edge
->
pathValidation
());
p
.
pathValidation
(
edge
->
pathValidation
());
pathOptimizer_
=
factory_
(
p
);
pathOptimizer_
=
factory_
(
p
);
toConcat
=
pathOptimizer_
->
optimize
(
toOpt
);
toConcat
=
pathOptimizer_
->
optimize
(
toOpt
);
...
...
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