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
Pierre Fernbach
hpp-rbprm-corba
Commits
70816b09
Commit
70816b09
authored
Jan 16, 2020
by
Pierre Fernbach
Browse files
refactor hpp-spline -> Curves
parent
e3da9658
Pipeline
#7999
failed with stage
in 2 minutes and 23 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/hpp/corbaserver/rbprm/rbprmfullbody.py
View file @
70816b09
...
...
@@ -18,7 +18,7 @@
from
hpp.corbaserver.rbprm
import
Client
as
RbprmClient
from
hpp.corbaserver.robot
import
Robot
from
hpp_spline
import
bezier
from
curves
import
bezier
from
numpy
import
array
,
matrix
...
...
src/rbprmbuilder.impl.cc
View file @
70816b09
...
...
@@ -43,7 +43,6 @@
#include
<hpp/rbprm/planner/rbprm-steering-kinodynamic.hh>
#include
<algorithm>
// std::random_shuffle
#include
<hpp/rbprm/interpolation/time-constraint-helper.hh>
#include
<hpp/spline/bezier_curve.h>
#include
<hpp/rbprm/interpolation/polynom-trajectory.hh>
#include
<hpp/rbprm/planner/random-shortcut-dynamic.hh>
#include
<hpp/rbprm/planner/oriented-path-optimizer.hh>
...
...
@@ -59,7 +58,6 @@
namespace
hpp
{
namespace
rbprm
{
typedef
spline
::
bezier_curve
<>
bezier
;
namespace
impl
{
const
pinocchio
::
Computation_t
flag
=
...
...
@@ -1807,7 +1805,7 @@ CORBA::Short RbprmBuilder::straightPath(const hpp::floatSeqSeq& positions) throw
CORBA
::
Short
RbprmBuilder
::
generateCurveTraj
(
const
hpp
::
floatSeqSeq
&
positions
)
throw
(
hpp
::
Error
)
{
try
{
T_Configuration
c
=
doubleDofArrayToConfig
(
3
,
positions
);
bezier
*
curve
=
new
bezier
(
c
.
begin
(),
c
.
end
());
bezier
_t
*
curve
=
new
bezier
_t
(
c
.
begin
(),
c
.
end
());
hpp
::
rbprm
::
interpolation
::
PolynomPtr_t
curvePtr
(
curve
);
hpp
::
rbprm
::
interpolation
::
PolynomTrajectoryPtr_t
path
=
hpp
::
rbprm
::
interpolation
::
PolynomTrajectory
::
create
(
curvePtr
);
...
...
@@ -1824,7 +1822,7 @@ CORBA::Short RbprmBuilder::generateCurveTrajParts(const hpp::floatSeqSeq& positi
try
{
pinocchio
::
Configuration_t
config
=
dofArrayToConfig
((
std
::
size_t
)
partitions
.
length
(),
partitions
);
T_Configuration
c
=
doubleDofArrayToConfig
(
3
,
positions
);
bezier
*
curve
=
new
bezier
(
c
.
begin
(),
c
.
end
());
bezier
_t
*
curve
=
new
bezier
_t
(
c
.
begin
(),
c
.
end
());
hpp
::
rbprm
::
interpolation
::
PolynomPtr_t
curvePtr
(
curve
);
hpp
::
rbprm
::
interpolation
::
PolynomTrajectoryPtr_t
path
=
hpp
::
rbprm
::
interpolation
::
PolynomTrajectory
::
create
(
curvePtr
);
...
...
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