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
397ca709
Commit
397ca709
authored
7 years ago
by
Joseph Mirabel
Committed by
Florent Lamiraux florent@laas.fr
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Overwrite path projector factories
parent
394bf7af
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/problem-solver.cc
+25
-0
25 additions, 0 deletions
src/problem-solver.cc
with
25 additions
and
0 deletions
src/problem-solver.cc
+
25
−
0
View file @
397ca709
...
@@ -28,6 +28,10 @@
...
@@ -28,6 +28,10 @@
#include
<hpp/core/random-shortcut.hh>
#include
<hpp/core/random-shortcut.hh>
#include
<hpp/core/path-optimization/partial-shortcut.hh>
#include
<hpp/core/path-optimization/partial-shortcut.hh>
#include
"hpp/core/path-projector/progressive.hh"
#include
"hpp/core/path-projector/dichotomy.hh"
#include
"hpp/core/path-projector/global.hh"
#include
"hpp/core/path-projector/recursive-hermite.hh"
#include
<hpp/core/roadmap.hh>
#include
<hpp/core/roadmap.hh>
#include
<hpp/core/steering-method-straight.hh>
#include
<hpp/core/steering-method-straight.hh>
#include
<hpp/core/comparison-type.hh>
#include
<hpp/core/comparison-type.hh>
...
@@ -72,6 +76,18 @@ namespace hpp {
...
@@ -72,6 +76,18 @@ namespace hpp {
createWithTraits
<
InnerConfigOptimizationTraits
>
(
problem
);
createWithTraits
<
InnerConfigOptimizationTraits
>
(
problem
);
}
}
};
};
template
<
typename
PathProjectorType
>
core
::
PathProjectorPtr_t
createPathProjector
(
const
core
::
Problem
&
problem
,
const
value_type
&
step
)
{
GraphSteeringMethodPtr_t
gsm
=
HPP_DYNAMIC_PTR_CAST
(
GraphSteeringMethod
,
problem
.
steeringMethod
());
if
(
!
gsm
)
throw
std
::
logic_error
(
"The steering method should be of type"
" GraphSteeringMethod"
);
return
PathProjectorType
::
create
(
problem
.
distance
(),
gsm
->
innerSteeringMethod
(),
step
);
}
}
}
std
::
ostream
&
operator
<<
(
std
::
ostream
&
os
,
const
Device
&
robot
)
std
::
ostream
&
operator
<<
(
std
::
ostream
&
os
,
const
Device
&
robot
)
...
@@ -102,6 +118,15 @@ namespace hpp {
...
@@ -102,6 +118,15 @@ namespace hpp {
<
pathOptimization
::
ConfigOptimizationTraits
>
<
pathOptimization
::
ConfigOptimizationTraits
>
>
);
>
);
parent_t
::
add
<
core
::
PathProjectorBuilder_t
>
(
"Progressive"
,
createPathProjector
<
core
::
pathProjector
::
Progressive
>
);
parent_t
::
add
<
core
::
PathProjectorBuilder_t
>
(
"Dichotomy"
,
createPathProjector
<
core
::
pathProjector
::
Dichotomy
>
);
parent_t
::
add
<
core
::
PathProjectorBuilder_t
>
(
"Global"
,
createPathProjector
<
core
::
pathProjector
::
Global
>
);
parent_t
::
add
<
core
::
PathProjectorBuilder_t
>
(
"RecursiveHermite"
,
createPathProjector
<
core
::
pathProjector
::
RecursiveHermite
>
);
parent_t
::
add
<
PathOptimizerBuilder_t
>
(
"SplineGradientBased_cannonical1"
,
pathOptimization
::
SplineGradientBased
<
core
::
path
::
CanonicalPolynomeBasis
,
1
>::
createFromCore
);
parent_t
::
add
<
PathOptimizerBuilder_t
>
(
"SplineGradientBased_cannonical1"
,
pathOptimization
::
SplineGradientBased
<
core
::
path
::
CanonicalPolynomeBasis
,
1
>::
createFromCore
);
parent_t
::
add
<
PathOptimizerBuilder_t
>
(
"SplineGradientBased_cannonical2"
,
pathOptimization
::
SplineGradientBased
<
core
::
path
::
CanonicalPolynomeBasis
,
2
>::
createFromCore
);
parent_t
::
add
<
PathOptimizerBuilder_t
>
(
"SplineGradientBased_cannonical2"
,
pathOptimization
::
SplineGradientBased
<
core
::
path
::
CanonicalPolynomeBasis
,
2
>::
createFromCore
);
parent_t
::
add
<
PathOptimizerBuilder_t
>
(
"SplineGradientBased_cannonical3"
,
pathOptimization
::
SplineGradientBased
<
core
::
path
::
CanonicalPolynomeBasis
,
3
>::
createFromCore
);
parent_t
::
add
<
PathOptimizerBuilder_t
>
(
"SplineGradientBased_cannonical3"
,
pathOptimization
::
SplineGradientBased
<
core
::
path
::
CanonicalPolynomeBasis
,
3
>::
createFromCore
);
...
...
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