Skip to content
Snippets Groups Projects
Commit 5c3aa71a authored by Florent Lamiraux's avatar Florent Lamiraux
Browse files

[Handle] Use constraints with values in R3xSO(3) for grasp constraints

  RelativeTransformation -> RelativeTransformationSE3 with mask.
parent 4a2a4309
No related branches found
No related tags found
No related merge requests found
...@@ -75,6 +75,7 @@ namespace hpp { ...@@ -75,6 +75,7 @@ namespace hpp {
typedef constraints::RelativeOrientationPtr_t RelativeOrientationPtr_t; typedef constraints::RelativeOrientationPtr_t RelativeOrientationPtr_t;
typedef constraints::RelativePositionPtr_t RelativePositionPtr_t; typedef constraints::RelativePositionPtr_t RelativePositionPtr_t;
typedef constraints::RelativeTransformation RelativeTransformation; typedef constraints::RelativeTransformation RelativeTransformation;
typedef constraints::RelativeTransformationSE3 RelativeTransformationSE3;
typedef constraints::RelativeTransformationPtr_t typedef constraints::RelativeTransformationPtr_t
RelativeTransformationPtr_t; RelativeTransformationPtr_t;
typedef core::value_type value_type; typedef core::value_type value_type;
......
...@@ -132,10 +132,10 @@ namespace hpp { ...@@ -132,10 +132,10 @@ namespace hpp {
gripper->objectPositionInJoint (), localPosition(), gripper->objectPositionInJoint (), localPosition(),
6 * constraints::EqualToZero); 6 * constraints::EqualToZero);
} }
return Implicit::create (RelativeTransformation::create return Implicit::create (RelativeTransformationSE3::create
(n, robot (), gripper->joint (), joint (), (n, robot (), gripper->joint (), joint (),
gripper->objectPositionInJoint (), localPosition(), mask_), gripper->objectPositionInJoint (), localPosition()),
ComparisonTypes_t (maskSize (mask_), constraints::EqualToZero)); 6 * constraints::EqualToZero, mask_);
} }
ImplicitPtr_t Handle::createGraspComplement ImplicitPtr_t Handle::createGraspComplement
...@@ -153,19 +153,16 @@ namespace hpp { ...@@ -153,19 +153,16 @@ namespace hpp {
r->configSize(), r->numberDof (), n)), ComparisonTypes_t()); r->configSize(), r->numberDof (), n)), ComparisonTypes_t());
} else { } else {
std::vector<bool> Cmask = complementMask(mask_); std::vector<bool> Cmask = complementMask(mask_);
return Implicit::create (RelativeTransformation::create return Implicit::create (RelativeTransformationSE3::create
(n, r, gripper->joint (), joint (), (n, r, gripper->joint (), joint (),
gripper->objectPositionInJoint (), localPosition(), gripper->objectPositionInJoint (), localPosition()),
Cmask), 6 * constraints::Equality, Cmask);
maskSize(Cmask) * constraints::Equality);
} }
} }
ImplicitPtr_t Handle::createGraspAndComplement ImplicitPtr_t Handle::createGraspAndComplement
(const GripperPtr_t& gripper, std::string n) const (const GripperPtr_t& gripper, std::string n) const
{ {
using boost::assign::list_of;
using core::ExplicitRelativeTransformation;
if (n.empty()) { if (n.empty()) {
n = gripper->name() + "_holds_" + name(); n = gripper->name() + "_holds_" + name();
} }
...@@ -185,11 +182,10 @@ namespace hpp { ...@@ -185,11 +182,10 @@ namespace hpp {
(n, robot (), gripper->joint (), joint (), (n, robot (), gripper->joint (), joint (),
gripper->objectPositionInJoint (), localPosition(), comp); gripper->objectPositionInJoint (), localPosition(), comp);
} }
return Implicit::create (RelativeTransformation::create return Implicit::create (RelativeTransformationSE3::create
(n, robot (), gripper->joint (), joint (), (n, robot (), gripper->joint (), joint (),
gripper->objectPositionInJoint (), localPosition(), gripper->objectPositionInJoint (), localPosition()),
std::vector <bool> (6, true)), comp, std::vector <bool> (6, true));
comp);
} }
ImplicitPtr_t Handle::createPreGrasp ImplicitPtr_t Handle::createPreGrasp
...@@ -201,10 +197,10 @@ namespace hpp { ...@@ -201,10 +197,10 @@ namespace hpp {
n = "Pregrasp_ " + maskToStr(mask_) + "_" + name () n = "Pregrasp_ " + maskToStr(mask_) + "_" + name ()
+ "_" + gripper->name (); + "_" + gripper->name ();
ImplicitPtr_t result (Implicit::create ImplicitPtr_t result (Implicit::create
(RelativeTransformation::create (RelativeTransformationSE3::create
(n, robot(), gripper->joint (), joint (), (n, robot(), gripper->joint (), joint (),
M, localPosition(), mask_), M, localPosition()),
maskSize(mask_) * constraints::EqualToZero)); 6 * constraints::EqualToZero, mask_));
return result; return result;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment