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

Update headers to changes in hpp-constraints (GenericTransformation)

parent 12853855
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <hpp/model/joint.hh> #include <hpp/model/joint.hh>
#include <hpp/model/gripper.hh> #include <hpp/model/gripper.hh>
#include <hpp/constraints/relative-transformation.hh> #include <hpp/constraints/generic-transformation.hh>
#include <hpp/core/numerical-constraint.hh> #include <hpp/core/numerical-constraint.hh>
......
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
#include <hpp/model/joint.hh> #include <hpp/model/joint.hh>
#include <hpp/model/gripper.hh> #include <hpp/model/gripper.hh>
#include <hpp/constraints/relative-position.hh> #include <hpp/constraints/generic-transformation.hh>
#include <hpp/constraints/relative-transformation.hh>
#include <hpp/core/numerical-constraint.hh> #include <hpp/core/numerical-constraint.hh>
#include <hpp/core/explicit-numerical-constraint.hh> #include <hpp/core/explicit-numerical-constraint.hh>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <hpp/model/configuration.hh> #include <hpp/model/configuration.hh>
#include <hpp/model/object-factory.hh> #include <hpp/model/object-factory.hh>
#include <hpp/constraints/position.hh> #include <hpp/constraints/generic-transformation.hh>
#define REQUIRE_MESSAGE(b,m) do {\ #define REQUIRE_MESSAGE(b,m) do {\
if (!b) {\ if (!b) {\
...@@ -79,8 +79,6 @@ using hpp::core::pathProjector::Progressive; ...@@ -79,8 +79,6 @@ using hpp::core::pathProjector::Progressive;
using hpp::core::Problem; using hpp::core::Problem;
using hpp::core::ProblemPtr_t; using hpp::core::ProblemPtr_t;
static matrix3_t identity () { matrix3_t R; R.setIdentity (); return R;}
hpp::model::ObjectFactory objectFactory; hpp::model::ObjectFactory objectFactory;
namespace hpp_test { namespace hpp_test {
...@@ -177,7 +175,8 @@ int main (int , char**) { ...@@ -177,7 +175,8 @@ int main (int , char**) {
JointPtr_t ee = r->getJointByName ("FOREARM"); JointPtr_t ee = r->getJointByName ("FOREARM");
vector3_t target (0, (ARM_LENGTH + FOREARM_LENGTH ) / 2, 0), vector3_t target (0, (ARM_LENGTH + FOREARM_LENGTH ) / 2, 0),
origin (0, FOREARM_LENGTH, 0); origin (0, FOREARM_LENGTH, 0);
PositionPtr_t c = Position::create (r, ee, origin, target, identity (), list_of (false)(true)(false)); PositionPtr_t c = Position::create ("Pos", r, ee, origin, target,
list_of (false)(true)(false).convert_to_container<std::vector<bool> >());
ConstraintSetPtr_t cs = ConstraintSet::create (r, "test-cs"); ConstraintSetPtr_t cs = ConstraintSet::create (r, "test-cs");
ConfigProjectorPtr_t proj = ConfigProjector::create (r, "test", 1e-4, 20); ConfigProjectorPtr_t proj = ConfigProjector::create (r, "test", 1e-4, 20);
proj->add (NumericalConstraint::create (c)); proj->add (NumericalConstraint::create (c));
......
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