Skip to content
Snippets Groups Projects
Commit dc6e1bcc authored by Pierre Fernbach's avatar Pierre Fernbach
Browse files

[python] rename computeEndEffectorCost to computeEndEffectorVelocityCost

parent 3fe4c800
No related branches found
No related tags found
No related merge requests found
...@@ -396,10 +396,10 @@ MatrixVector* computeEndEffectorConstraintsPython(const ProblemData& pData, cons ...@@ -396,10 +396,10 @@ MatrixVector* computeEndEffectorConstraintsPython(const ProblemData& pData, cons
return res; return res;
} }
MatrixVector* computeEndEffectorCostPython(const ProblemData& pData, const double time){ MatrixVector* computeEndEffectorVelocityCostPython(const ProblemData& pData, const double time){
std::vector<bezier_t::point_t> pi = computeConstantWaypoints(pData,time); std::vector<bezier_t::point_t> pi = computeConstantWaypoints(pData,time);
MatrixVector* res = new MatrixVector(); MatrixVector* res = new MatrixVector();
res->res = computeEndEffectorCost<DummyPath>(pData,DummyPath(),time, 0,false,pi); res->res = computeVelocityCost(pData,time,pi);
return res; return res;
} }
...@@ -412,6 +412,7 @@ Eigen::Matrix<real, Eigen::Dynamic, Eigen::Dynamic> computeEndEffectorConstantWa ...@@ -412,6 +412,7 @@ Eigen::Matrix<real, Eigen::Dynamic, Eigen::Dynamic> computeEndEffectorConstantWa
return res; return res;
} }
/** END end effector **/ /** END end effector **/
...@@ -533,7 +534,7 @@ BOOST_PYTHON_MODULE(hpp_bezier_com_traj) ...@@ -533,7 +534,7 @@ BOOST_PYTHON_MODULE(hpp_bezier_com_traj)
def("computeCOMTraj", &computeCOMTrajPointerChooseSolver, return_value_policy<manage_new_object>()); def("computeCOMTraj", &computeCOMTrajPointerChooseSolver, return_value_policy<manage_new_object>());
def("computeEndEffector", &computeEndEffector, return_value_policy<manage_new_object>()); def("computeEndEffector", &computeEndEffector, return_value_policy<manage_new_object>());
def("computeEndEffectorConstraints", &computeEndEffectorConstraintsPython, return_value_policy<manage_new_object>()); def("computeEndEffectorConstraints", &computeEndEffectorConstraintsPython, return_value_policy<manage_new_object>());
def("computeEndEffectorCost", &computeEndEffectorCostPython, return_value_policy<manage_new_object>()); def("computeEndEffectorVelocityCost", &computeEndEffectorVelocityCostPython, return_value_policy<manage_new_object>());
def("computeEndEffectorConstantWaypoints", &computeEndEffectorConstantWaypoints); def("computeEndEffectorConstantWaypoints", &computeEndEffectorConstantWaypoints);
......
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