Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
hpp-rbprm-corba
Commits
7c9ecdb7
Commit
7c9ecdb7
authored
Jul 19, 2016
by
Steve Tonneau
Browse files
templated limb-rrt to handle user defined path
parent
20ea3c57
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/rbprmbuilder.impl.cc
View file @
7c9ecdb7
...
...
@@ -22,6 +22,7 @@
#include
"hpp/rbprm/rbprm-validation.hh"
#include
"hpp/rbprm/interpolation/rbprm-path-interpolation.hh"
#include
"hpp/rbprm/interpolation/limb-rrt-helper.hh"
#include
"hpp/rbprm/interpolation/limb-rrt-path.hh"
#include
"hpp/rbprm/stability/stability.hh"
#include
"hpp/rbprm/sampling/sample-db.hh"
#include
"hpp/model/urdf/util.hh"
...
...
@@ -673,7 +674,7 @@ namespace hpp {
}
//create helper
// /interpolation::LimbRRTHelper helper(fullBody_, problemSolver_->problem());
core
::
PathPtr_t
path
=
interpolation
::
interpolateStates
(
fullBody_
,
problemSolver_
->
problem
(),
core
::
PathPtr_t
path
=
interpolation
::
interpolateStates
<
rbprm
::
interpolation
::
LimbRRTPath
>
(
fullBody_
,
problemSolver_
->
problem
(),
lastStatesComputed_
.
begin
()
+
s1
,
lastStatesComputed_
.
begin
()
+
s2
,
numOptimizations
);
AddPath
(
path
,
problemSolver_
);
}
...
...
@@ -697,7 +698,7 @@ namespace hpp {
{
throw
std
::
runtime_error
(
"No path computed, cannot interpolate "
);
}
core
::
PathPtr_t
path
=
interpolation
::
interpolateStates
(
fullBody_
,
problemSolver_
->
problem
(),
problemSolver_
->
paths
()[
pathId
],
core
::
PathPtr_t
path
=
interpolation
::
interpolateStates
<
rbprm
::
interpolation
::
LimbRRTPath
>
(
fullBody_
,
problemSolver_
->
problem
(),
problemSolver_
->
paths
()[
pathId
],
lastStatesComputedTime_
.
begin
()
+
s1
,
lastStatesComputedTime_
.
begin
()
+
s2
,
numOptimizations
);
AddPath
(
path
,
problemSolver_
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment