Skip to content
Snippets Groups Projects
Commit a3cce3b8 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Add LockedJoint before NumericalConstraint into ConfigProjector

parent cbcf3dd0
No related branches found
No related tags found
No related merge requests found
......@@ -205,14 +205,6 @@ namespace hpp {
ConstraintSetPtr_t constraint = ConstraintSet::create (g->robot (), "Set " + n);
ConfigProjectorPtr_t proj = ConfigProjector::create(g->robot(), "proj_" + n, g->errorThreshold(), g->maxIterations());
g->insertNumericalConstraints (proj);
insertNumericalConstraints (proj);
to ()->insertNumericalConstraints (proj);
if (state () != to ()) {
state ()->insertNumericalConstraints (proj);
}
constraint->addConstraint (proj);
g->insertLockedJoints (proj);
insertLockedJoints (proj);
to ()->insertLockedJoints (proj);
......@@ -220,6 +212,14 @@ namespace hpp {
state ()->insertLockedJoints (proj);
}
g->insertNumericalConstraints (proj);
insertNumericalConstraints (proj);
to ()->insertNumericalConstraints (proj);
if (state () != to ()) {
state ()->insertNumericalConstraints (proj);
}
constraint->addConstraint (proj);
constraint->edge (wkPtr_.lock ());
return constraint;
}
......@@ -241,15 +241,15 @@ namespace hpp {
ConstraintSetPtr_t constraint = ConstraintSet::create (g->robot (), "Set " + n);
ConfigProjectorPtr_t proj = ConfigProjector::create(g->robot(), "proj_" + n, g->errorThreshold(), g->maxIterations());
g->insertNumericalConstraints (proj);
insertNumericalConstraints (proj);
state ()->insertNumericalConstraintsForPath (proj);
constraint->addConstraint (proj);
g->insertLockedJoints (proj);
insertLockedJoints (proj);
state ()->insertLockedJoints (proj);
g->insertNumericalConstraints (proj);
insertNumericalConstraints (proj);
state ()->insertNumericalConstraintsForPath (proj);
constraint->addConstraint (proj);
constraint->edge (wkPtr_.lock ());
// Build steering method
......
......@@ -114,7 +114,7 @@ namespace hpp {
return ExplicitRelativeTransformation::create
("Explicit_relative_transform_" + name () + "_" + gripper->name (),
gripper->joint ()->robot (), gripper->joint (), joint (),
gripper->objectPositionInJoint (), localPosition());
gripper->objectPositionInJoint (), localPosition())->createNumericalConstraint();
}
return NumericalConstraintPtr_t
(NumericalConstraint::create (RelativeTransformation::create
......
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