Skip to content
Snippets Groups Projects
Commit 81dbbc61 authored by Florent Lamiraux's avatar Florent Lamiraux Committed by Florent Lamiraux florent@laas.fr
Browse files

Update to modifications in hpp-constraints

  constraints::implicit::RelativePose has been removed.
parent b8d41668
No related branches found
No related tags found
No related merge requests found
......@@ -29,7 +29,7 @@
#include <hpp/pinocchio/joint-collection.hh>
#include <hpp/pinocchio/gripper.hh>
#include <hpp/constraints/differentiable-function.hh>
#include <hpp/constraints/generic-transformation.hh>
#include <hpp/constraints/implicit.hh>
#include <hpp/constraints/explicit/relative-pose.hh>
......@@ -132,10 +132,12 @@ namespace hpp {
gripper->objectPositionInJoint (), localPosition(),
mask_, ComparisonTypes_t (6, constraints::EqualToZero));
}
return constraints::implicit::RelativePose::create
(n, robot (), gripper->joint (), joint (),
gripper->objectPositionInJoint (), localPosition(),
mask_, ComparisonTypes_t (maskSize (mask_), constraints::EqualToZero));
return constraints::Implicit::create
(constraints::RelativeTransformation::create
(n, robot (), gripper->joint (), joint (),
gripper->objectPositionInJoint (), localPosition(),
mask_),
ComparisonTypes_t (maskSize (mask_), constraints::EqualToZero));
}
ImplicitPtr_t Handle::createGraspComplement
......@@ -154,10 +156,12 @@ namespace hpp {
);
} else {
std::vector<bool> Cmask = complementMask(mask_);
return constraints::implicit::RelativePose::create
(n, r, gripper->joint (), joint (),
gripper->objectPositionInJoint (), localPosition(),
Cmask, ComparisonTypes_t (maskSize (Cmask), constraints::Equality));
return Implicit::create
(constraints::RelativeTransformation::create
(n, r, gripper->joint (), joint (),
gripper->objectPositionInJoint (), localPosition(),
Cmask),
ComparisonTypes_t (maskSize (Cmask), constraints::Equality));
}
}
......@@ -186,10 +190,11 @@ namespace hpp {
gripper->objectPositionInJoint (), localPosition(),
std::vector <bool> (6, true), comp);
}
return constraints::implicit::RelativePose::create
(n, robot (), gripper->joint (), joint (),
gripper->objectPositionInJoint (), localPosition(),
std::vector <bool> (6, true), comp);
return Implicit::create
(constraints::RelativeTransformation::create
(n, robot (), gripper->joint (), joint (),
gripper->objectPositionInJoint (), localPosition(),
std::vector <bool> (6, true)), comp);
}
ImplicitPtr_t Handle::createPreGrasp
......@@ -201,10 +206,11 @@ namespace hpp {
n = "Pregrasp_ " + maskToStr(mask_) + "_" + name ()
+ "_" + gripper->name ();
ImplicitPtr_t result
(constraints::implicit::RelativePose::create
(n, robot(), gripper->joint (), joint (),
transform, localPosition(), mask_, ComparisonTypes_t
(maskSize (mask_), constraints::EqualToZero)));
(Implicit::create
(constraints::RelativeTransformation::create
(n, robot(), gripper->joint (), joint (),
transform, localPosition(), mask_),
ComparisonTypes_t(maskSize (mask_), constraints::EqualToZero)));
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