Skip to content
GitLab
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
59c1e1f8
Commit
59c1e1f8
authored
Jan 03, 2018
by
Pierre Fernbach
Browse files
t_rrt functor now take a problemSolver instead of a problem
see commit in rbprm : cd4fce4
parent
3fab068a
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/rbprmbuilder.impl.cc
View file @
59c1e1f8
...
...
@@ -2195,8 +2195,8 @@ assert(s2 == s1 +1);
try
{
hppDout
(
notice
,
"begin comRRT between statebis 1 and 2"
);
core
::
PathPtr_t
p2
=
(
*
functor
)(
fullBody
(),
problemSolver
()
->
problem
()
,
paths
[
cT2
],
s1Bis
,
s2Bis
,
numOptimizations
,
true
,
problemSolver
()
->
paths
().
size
()
);
core
::
PathPtr_t
p2
=
(
*
functor
)(
fullBody
(),
problemSolver
(),
paths
[
cT2
],
s1Bis
,
s2Bis
,
numOptimizations
,
true
);
hppDout
(
notice
,
"end comRRT"
);
pathsIds
.
push_back
(
AddPath
(
p2
,
problemSolver
()));
// reduce path to remove extradof
...
...
@@ -2314,8 +2314,8 @@ assert(s2 == s1 +1);
comPath
->
appendPath
(
paths
[
cT3
]);
std
::
vector
<
std
::
string
>
trackedEffectorNames
=
stringConversion
(
trackedEffector
);
core
::
PathPtr_t
refFullBody
=
problemSolver
()
->
paths
()[
refpath
]
->
extract
(
std
::
make_pair
(
path_from
,
path_to
));
core
::
PathPtr_t
p2
=
interpolation
::
effectorRRTFromPath
(
fullBody
(),
problemSolver
()
->
problem
()
,
comPath
,
state1
,
state2
,
numOptimizations
,
true
,
problemSolver
()
->
paths
().
size
(),
refFullBody
,
trackedEffectorNames
);
core
::
PathPtr_t
p2
=
interpolation
::
effectorRRTFromPath
(
fullBody
(),
problemSolver
(),
comPath
,
state1
,
state2
,
numOptimizations
,
true
,
refFullBody
,
trackedEffectorNames
);
pathsIds
.
push_back
(
AddPath
(
p2
,
problemSolver
()));
// reduce path to remove extradof
...
...
src/rbprmbuilder.impl.hh
View file @
59c1e1f8
...
...
@@ -271,8 +271,8 @@ namespace hpp {
virtual
CORBA
::
Short
comRRT
(
double
state1
,
double
state2
,
unsigned
short
path
,
unsigned
short
numOptimizations
)
throw
(
hpp
::
Error
);
typedef
core
::
PathPtr_t
(
*
t_rrt
)
(
RbPrmFullBodyPtr_t
,
core
::
ProblemPtr_t
,
const
core
::
PathPtr_t
,
const
State
&
,
const
State
&
,
const
std
::
size_t
,
const
bool
,
const
std
::
size_t
);
(
RbPrmFullBodyPtr_t
,
core
::
Problem
Solver
Ptr_t
,
const
core
::
PathPtr_t
,
const
State
&
,
const
State
&
,
const
std
::
size_t
,
const
bool
);
hpp
::
floatSeq
*
rrt
(
t_rrt
functor
,
double
state1
,
double
state2
,
unsigned
short
comTraj1
,
unsigned
short
comTraj2
,
unsigned
short
comTraj3
,
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment