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
403f992a
Unverified
Commit
403f992a
authored
Apr 16, 2019
by
stonneau
Committed by
GitHub
Apr 16, 2019
Browse files
Merge pull request #26 from pFernbach/topic/com_rrt
fix com-rrt Python API
parents
4da93bb2
709f132c
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/rbprmbuilder.impl.cc
View file @
403f992a
...
...
@@ -2552,20 +2552,21 @@ namespace hpp {
State
s2
=
lastStatesComputed_
[
size_t
(
state2
)];
hppDout
(
notice
,
"state1 = r(["
<<
pinocchio
::
displayConfig
(
s1
.
configuration_
)
<<
")]"
);
hppDout
(
notice
,
"state2 = r(["
<<
pinocchio
::
displayConfig
(
s2
.
configuration_
)
<<
")]"
);
core
::
PathVectorPtr_t
resPath
=
core
::
PathVector
::
create
(
fullBody
()
->
device_
->
configSize
(),
fullBody
()
->
device_
->
numberDof
());
//
core::PathVectorPtr_t resPath = core::PathVector::create(fullBody()->device_->configSize(), fullBody()->device_->numberDof());
std
::
vector
<
CORBA
::
Short
>
pathsIds
;
core
::
PathPtr_t
p1
=
(
*
functor
)(
fullBody
(),
problemSolver
(),
paths
[
comTraj
],
s1
,
s2
,
numOptimizations
,
tru
e
);
s1
,
s2
,
numOptimizations
,
fals
e
);
hppDout
(
notice
,
"effectorRRT done."
);
// reduce path to remove extradof
core
::
segment_t
interval
(
0
,
p1
->
initial
().
rows
()
-
1
);
/*
core::segment_t interval(0, p1->initial().rows()-1);
core::segments_t intervals;
intervals.push_back(interval);
core::segments_t velIntervals (1, core::segment_t (0, fullBody()->device_->numberDof()));
PathPtr_t reducedPath = core::SubchainPath::create(p1,intervals, velIntervals);
resPath->appendPath(reducedPath);
pathsIds
.
push_back
((
CORBA
::
Short
)
problemSolver
()
->
addPath
(
resPath
));
*/
pathsIds
.
push_back
((
CORBA
::
Short
)
AddPath
(
p1
,
problemSolver
()));
hpp
::
floatSeq
*
dofArray
=
new
hpp
::
floatSeq
();
dofArray
->
length
((
_CORBA_ULong
)
pathsIds
.
size
());
...
...
Write
Preview
Markdown
is supported
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