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
Guilhem Saurel
hpp-manipulation
Commits
ae34cfef
Commit
ae34cfef
authored
9 years ago
by
Joseph Mirabel
Committed by
Joseph Mirabel
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
PreGrasp are not using inequality constraints. Remove Handle::preGrapsComplement
parent
c6fb6381
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/hpp/manipulation/handle.hh
+4
-16
4 additions, 16 deletions
include/hpp/manipulation/handle.hh
src/handle.cc
+4
-23
4 additions, 23 deletions
src/handle.cc
with
8 additions
and
39 deletions
include/hpp/manipulation/handle.hh
+
4
−
16
View file @
ae34cfef
...
...
@@ -102,23 +102,11 @@ namespace hpp {
/// \param gripper object containing the gripper information
/// \return the constraint of relative transformation between the handle and
/// the gripper.
/// \note Only 5 DOFs of the relative transformation between the handle and the gripper
/// are constrained. The translation along x-axis is not constrained.
/// \note 6 DOFs of the relative transformation between the handle and the gripper
/// are constrained. The transformation is shifted along x-axis of
/// value shift.
virtual
NumericalConstraintPtr_t
createPreGrasp
(
const
GripperPtr_t
&
gripper
)
const
;
/// Create constraint that acts on the non-constrained axis of the
/// constraint generated by Handle::createPreGrasp.
/// \param gripper object containing the gripper information
/// \param shift the target value along the x-axis
/// \param width width of the interval of freedom of gripper along x-axis.
/// \return the constraint of relative position between the handle and
/// the gripper.
/// \note Only the x-axis of the relative transformation between the handle and the gripper
/// is constrained.
virtual
NumericalConstraintPtr_t
createPreGraspComplement
(
const
GripperPtr_t
&
gripper
,
const
value_type
&
shift
,
const
value_type
&
width
)
const
;
(
const
GripperPtr_t
&
gripper
,
const
value_type
&
shift
)
const
;
static
NumericalConstraintPtr_t
createGrasp
(
const
GripperPtr_t
&
gripper
,
const
HandlePtr_t
&
handle
)
...
...
This diff is collapsed.
Click to expand it.
src/handle.cc
+
4
−
23
View file @
ae34cfef
...
...
@@ -93,38 +93,19 @@ namespace hpp {
}
NumericalConstraintPtr_t
Handle
::
createPreGrasp
(
const
GripperPtr_t
&
gripper
)
const
{
using
boost
::
assign
::
list_of
;
std
::
vector
<
bool
>
mask
=
list_of
(
false
)(
true
)(
true
)(
true
)(
true
)(
true
);
return
NumericalConstraintPtr_t
(
NumericalConstraint
::
create
(
RelativeTransformation
::
create
(
"Transformation_(0,1,1,1,1,1)_"
+
name
()
+
"_"
+
gripper
->
name
(),
gripper
->
joint
()
->
robot
(),
gripper
->
joint
(),
joint
(),
gripper
->
objectPositionInJoint
(),
localPosition
(),
mask
)));
}
NumericalConstraintPtr_t
Handle
::
createPreGraspComplement
(
const
GripperPtr_t
&
gripper
,
const
value_type
&
shift
,
const
value_type
&
width
)
const
(
const
GripperPtr_t
&
gripper
,
const
value_type
&
shift
)
const
{
using
boost
::
assign
::
list_of
;
using
core
::
DoubleInequality
;
std
::
vector
<
bool
>
mask
=
list_of
(
true
)(
false
)(
false
)(
false
)(
false
)
(
false
);
std
::
vector
<
bool
>
mask
=
list_of
(
true
)(
true
)(
true
)(
true
)(
true
)(
true
);
Transform3f
transform
=
gripper
->
objectPositionInJoint
()
*
Transform3f
(
fcl
::
Vec3f
(
shift
,
0
,
0
));
return
NumericalConstraintPtr_t
(
NumericalConstraint
::
create
(
RelativeTransformation
::
create
(
"Transformation_(
1,0,0,0,0,0
)_"
+
name
()
(
"Transformation_(
0,1,1,1,1,1
)_"
+
name
()
+
"_"
+
gripper
->
name
(),
gripper
->
joint
()
->
robot
(),
gripper
->
joint
(),
joint
(),
transform
,
localPosition
(),
mask
),
DoubleInequality
::
create
(
width
)));
transform
,
localPosition
(),
mask
)));
}
HandlePtr_t
Handle
::
clone
()
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