Skip to content

Commit 71044ef

Browse files
[Device] Remove method integrate.
1 parent f8183fa commit 71044ef

File tree

2 files changed

+0
-44
lines changed

2 files changed

+0
-44
lines changed

include/sot/core/device.hh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -145,24 +145,8 @@ class SOT_CORE_EXPORT Device : public Entity {
145145
/// \}
146146

147147
protected:
148-
/// Compute roll pitch yaw angles of freeflyer joint.
149-
void integrateRollPitchYaw(dynamicgraph::Vector &state,
150-
const dynamicgraph::Vector &control, double dt);
151148
/// Store Position of free flyer joint
152149
MatrixHomogeneous ffPose_;
153-
/// Compute the new position, from the current control.
154-
///
155-
/// When sanity checks are enabled, this checks that the control is within
156-
/// bounds. There are three cases, depending on what the control is:
157-
/// - position: checks that the position is within bounds,
158-
/// - velocity: checks that the velocity and the future position are
159-
/// within bounds,
160-
/// - acceleration: checks that the acceleration, the future velocity and
161-
/// position are within bounds.
162-
/// \todo in order to check the acceleration, we need
163-
/// pinocchio and the contact forces in order to estimate
164-
/// the joint torques for the given acceleration.
165-
virtual void integrate(const double &dt);
166150

167151
protected:
168152
/// Get freeflyer pose

src/tools/device.cpp

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -69,31 +69,6 @@ inline double saturateBounds(double &val, const double &lower,
6969
/* --- CLASS ----------------------------------------------------------- */
7070
/* --------------------------------------------------------------------- */
7171

72-
void Device::integrateRollPitchYaw(Vector &state, const Vector &control,
73-
double dt) {
74-
using Eigen::AngleAxisd;
75-
using Eigen::QuaternionMapd;
76-
using Eigen::Vector3d;
77-
78-
typedef pinocchio::SpecialEuclideanOperationTpl<3, double> SE3;
79-
Eigen::Matrix<double, 7, 1> qin, qout;
80-
qin.head<3>() = state.head<3>();
81-
82-
QuaternionMapd quat(qin.tail<4>().data());
83-
quat = AngleAxisd(state(5), Vector3d::UnitZ()) *
84-
AngleAxisd(state(4), Vector3d::UnitY()) *
85-
AngleAxisd(state(3), Vector3d::UnitX());
86-
87-
SE3().integrate(qin, control.head<6>() * dt, qout);
88-
89-
// Update freeflyer pose
90-
ffPose_.translation() = qout.head<3>();
91-
state.head<3>() = qout.head<3>();
92-
93-
ffPose_.linear() = QuaternionMapd(qout.tail<4>().data()).toRotationMatrix();
94-
state.segment<3>(3) = ffPose_.linear().eulerAngles(2, 1, 0).reverse();
95-
}
96-
9772
const MatrixHomogeneous &Device::freeFlyerPose() const { return ffPose_; }
9873

9974
Device::~Device() {
@@ -382,9 +357,6 @@ void Device::setTorqueBounds(const Vector &lower, const Vector &upper) {
382357
}
383358

384359

385-
void Device::integrate(const double &dt) {
386-
}
387-
388360
/* --- DISPLAY ------------------------------------------------------------ */
389361

390362
void Device::display(std::ostream &os) const {

0 commit comments

Comments
 (0)