Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hpp-manipulation
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
Show more breadcrumbs
Humanoid Path Planner
hpp-manipulation
Commits
692915c6
Commit
692915c6
authored
10 years ago
by
Joseph Mirabel
Committed by
Joseph Mirabel
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add LockedDof constraint map to ProblemSolver
parent
5d0383e8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/hpp/manipulation/problem-solver.hh
+15
-1
15 additions, 1 deletion
include/hpp/manipulation/problem-solver.hh
src/problem-solver.cc
+10
-0
10 additions, 0 deletions
src/problem-solver.cc
with
25 additions
and
1 deletion
include/hpp/manipulation/problem-solver.hh
+
15
−
1
View file @
692915c6
...
...
@@ -36,7 +36,7 @@ namespace hpp {
{
}
ProblemSolver
()
:
core
::
ProblemSolver
(),
robot_
(),
robotsAndObjects_
(),
graspsMap_
()
robotsAndObjects_
(),
graspsMap_
()
,
lockedDofConstraintMap_
()
{
}
/// Set robot
...
...
@@ -105,6 +105,19 @@ namespace hpp {
/// return NULL if no grasp named graspName
GraspPtr_t
grasp
(
const
DifferentiableFunctionPtr_t
&
constraint
)
const
;
/// Add a LockedDof constraint to the map
/// \param name key of the constraint as stored in an internal map.
/// \param lockedDof the constraint to add.
void
addLockedDofConstraint
(
const
std
::
string
&
name
,
const
LockedDofPtr_t
&
lockedDof
)
{
lockedDofConstraintMap_
[
name
]
=
lockedDof
;
}
/// Get a LockedDof constraint by name
/// \param name key of the constraint as stored in an internal map.
LockedDofPtr_t
lockedDofConstraint
(
const
std
::
string
&
name
)
const
;
/// Reset constraint set and put back the disable collisions
/// between gripper and handle
virtual
void
resetConstraints
();
...
...
@@ -129,6 +142,7 @@ namespace hpp {
/// Map of single robots to store before building a composite robot.
RobotsandObjects_t
robotsAndObjects_
;
GraspsMap_t
graspsMap_
;
LockedDofConstraintMap_t
lockedDofConstraintMap_
;
};
// class ProblemSolver
}
// namespace manipulation
}
// namespace hpp
...
...
This diff is collapsed.
Click to expand it.
src/problem-solver.cc
+
10
−
0
View file @
692915c6
...
...
@@ -69,6 +69,16 @@ namespace hpp {
return
object
;
}
LockedDofPtr_t
ProblemSolver
::
lockedDofConstraint
(
const
std
::
string
&
name
)
const
{
LockedDofConstraintMap_t
::
const_iterator
it
=
lockedDofConstraintMap_
.
find
(
name
);
if
(
it
==
lockedDofConstraintMap_
.
end
())
{
throw
std
::
runtime_error
(
"No LockedDof constraint with this name"
);
}
return
it
->
second
;
}
GraspPtr_t
ProblemSolver
::
grasp
(
const
DifferentiableFunctionPtr_t
&
constraint
)
const
{
...
...
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