Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hpp-rbprm-corba
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Humanoid Path Planner
hpp-rbprm-corba
Commits
4504fba6
Commit
4504fba6
authored
8 years ago
by
Akseppal
Browse files
Options
Downloads
Patches
Plain Diff
use problemSolver_ affordances instead of bindShooter onces for updatability
parent
a59c9669
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!2
new release of the planner with clean demos / tutorials
,
!3
release of rbprm-corba for ijrr resubmission
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/rbprmbuilder.impl.cc
+13
-6
13 additions, 6 deletions
src/rbprmbuilder.impl.cc
with
13 additions
and
6 deletions
src/rbprmbuilder.impl.cc
+
13
−
6
View file @
4504fba6
...
@@ -282,11 +282,14 @@ namespace hpp {
...
@@ -282,11 +282,14 @@ namespace hpp {
{
{
dir
[
i
]
=
direction
[
i
];
dir
[
i
]
=
direction
[
i
];
}
}
if
(
bindShooter_
.
affMap_
.
empty
())
{
const
affMap_t
&
affMap
=
problemSolver_
->
map
<
std
::
vector
<
boost
::
shared_ptr
<
model
::
CollisionObject
>
>
>
();
if
(
affMap
.
empty
())
{
throw
hpp
::
Error
(
"No affordances found. Unable to generate Contacts."
);
throw
hpp
::
Error
(
"No affordances found. Unable to generate Contacts."
);
}
}
model
::
Configuration_t
config
=
dofArrayToConfig
(
fullBody_
->
device_
,
configuration
);
model
::
Configuration_t
config
=
dofArrayToConfig
(
fullBody_
->
device_
,
configuration
);
rbprm
::
State
state
=
rbprm
::
ComputeContacts
(
fullBody_
,
config
,
bindShooter_
.
affMap_
,
dir
);
rbprm
::
State
state
=
rbprm
::
ComputeContacts
(
fullBody_
,
config
,
affMap
,
bindShooter_
.
affFilter_
,
dir
);
hpp
::
floatSeq
*
dofArray
=
new
hpp
::
floatSeq
();
hpp
::
floatSeq
*
dofArray
=
new
hpp
::
floatSeq
();
dofArray
->
length
(
_CORBA_ULong
(
state
.
configuration_
.
rows
()));
dofArray
->
length
(
_CORBA_ULong
(
state
.
configuration_
.
rows
()));
for
(
std
::
size_t
i
=
0
;
i
<
_CORBA_ULong
(
config
.
rows
());
i
++
)
for
(
std
::
size_t
i
=
0
;
i
<
_CORBA_ULong
(
config
.
rows
());
i
++
)
...
@@ -451,14 +454,16 @@ namespace hpp {
...
@@ -451,14 +454,16 @@ namespace hpp {
{
{
throw
std
::
runtime_error
(
"End state not initialized, can not interpolate "
);
throw
std
::
runtime_error
(
"End state not initialized, can not interpolate "
);
}
}
if
(
bindShooter_
.
affMap_
.
empty
())
{
const
affMap_t
&
affMap
=
problemSolver_
->
map
<
std
::
vector
<
boost
::
shared_ptr
<
model
::
CollisionObject
>
>
>
();
if
(
affMap
.
empty
())
{
throw
hpp
::
Error
(
"No affordances found. Unable to interpolate."
);
throw
hpp
::
Error
(
"No affordances found. Unable to interpolate."
);
}
}
hpp
::
rbprm
::
RbPrmInterpolationPtr_t
interpolator
=
hpp
::
rbprm
::
RbPrmInterpolationPtr_t
interpolator
=
rbprm
::
RbPrmInterpolation
::
create
(
fullBody_
,
startState_
,
endState_
);
rbprm
::
RbPrmInterpolation
::
create
(
fullBody_
,
startState_
,
endState_
);
std
::
vector
<
model
::
Configuration_t
>
configurations
=
doubleDofArrayToConfig
(
fullBody_
->
device_
,
configs
);
std
::
vector
<
model
::
Configuration_t
>
configurations
=
doubleDofArrayToConfig
(
fullBody_
->
device_
,
configs
);
lastStatesComputed_
=
interpolator
->
Interpolate
(
bindShooter_
.
aff
Map
_
,
lastStatesComputed_
=
interpolator
->
Interpolate
(
affMap
,
bindShooter_
.
aff
Filter
_
,
configurations
,
robustnessTreshold
);
configurations
,
robustnessTreshold
);
hpp
::
floatSeqSeq
*
res
;
hpp
::
floatSeqSeq
*
res
;
res
=
new
hpp
::
floatSeqSeq
();
res
=
new
hpp
::
floatSeqSeq
();
...
@@ -507,13 +512,15 @@ namespace hpp {
...
@@ -507,13 +512,15 @@ namespace hpp {
{
{
throw
std
::
runtime_error
(
"No path computed, cannot interpolate "
);
throw
std
::
runtime_error
(
"No path computed, cannot interpolate "
);
}
}
if
(
bindShooter_
.
affMap_
.
empty
())
{
const
affMap_t
&
affMap
=
problemSolver_
->
map
<
std
::
vector
<
boost
::
shared_ptr
<
model
::
CollisionObject
>
>
>
();
if
(
affMap
.
empty
())
{
throw
hpp
::
Error
(
"No affordances found. Unable to interpolate."
);
throw
hpp
::
Error
(
"No affordances found. Unable to interpolate."
);
}
}
hpp
::
rbprm
::
RbPrmInterpolationPtr_t
interpolator
=
hpp
::
rbprm
::
RbPrmInterpolationPtr_t
interpolator
=
rbprm
::
RbPrmInterpolation
::
create
(
fullBody_
,
startState_
,
endState_
,
problemSolver_
->
paths
()[
pathId
]);
rbprm
::
RbPrmInterpolation
::
create
(
fullBody_
,
startState_
,
endState_
,
problemSolver_
->
paths
()[
pathId
]);
lastStatesComputed_
=
interpolator
->
Interpolate
(
bindShooter_
.
aff
Map
_
,
lastStatesComputed_
=
interpolator
->
Interpolate
(
affMap
,
bindShooter_
.
aff
Filter
_
,
timestep
,
robustnessTreshold
);
timestep
,
robustnessTreshold
);
hpp
::
floatSeqSeq
*
res
;
hpp
::
floatSeqSeq
*
res
;
...
...
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