Skip to content
Snippets Groups Projects
Commit e6be0375 authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Add move ctor / assign for CartesianPositionController,...

Add move ctor / assign for CartesianPositionController, CartesianVelocityController and CartesianVelocityControllerWithRamp
parent 51057492
No related branches found
No related tags found
No related merge requests found
......@@ -39,6 +39,9 @@ namespace armarx
public:
CartesianPositionController(const VirtualRobot::RobotNodePtr& tcp);
CartesianPositionController(CartesianPositionController&&) = default;
CartesianPositionController& operator=(CartesianPositionController&&) = default;
Eigen::VectorXf calculate(const Eigen::Matrix4f& targetPose, VirtualRobot::IKSolver::CartesianSelection mode) const;
float getPositionError(const Eigen::Matrix4f& targetPose) const;
......
......@@ -41,6 +41,9 @@ namespace armarx
const VirtualRobot::JacobiProvider::InverseJacobiMethod invJacMethod = VirtualRobot::JacobiProvider::eSVDDamped,
bool considerJointLimits = true);
CartesianVelocityController(CartesianVelocityController&&) = default;
CartesianVelocityController& operator=(CartesianVelocityController&&) = default;
Eigen::VectorXf calculate(const Eigen::VectorXf& cartesianVel, float KpJointLimitAvoidanceScale, VirtualRobot::IKSolver::CartesianSelection mode);
Eigen::VectorXf calculate(const Eigen::VectorXf& cartesianVel, const Eigen::VectorXf& nullspaceVel, VirtualRobot::IKSolver::CartesianSelection mode);
Eigen::VectorXf calculateJointLimitAvoidance();
......
......@@ -46,6 +46,9 @@ namespace armarx
float maxPositionAcceleration, float maxOrientationAcceleration, float maxNullspaceAcceleration,
const VirtualRobot::RobotNodePtr& tcp = nullptr);
CartesianVelocityControllerWithRamp(CartesianVelocityControllerWithRamp&&) = default;
CartesianVelocityControllerWithRamp& operator=(CartesianVelocityControllerWithRamp&&) = default;
void setCurrentJointVelocity(const Eigen::VectorXf& currentJointVelocity);
Eigen::VectorXf calculate(const Eigen::VectorXf& cartesianVel, float jointLimitAvoidanceScale, float dt);
......
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