Skip to content

Commit 6edb477

Browse files
author
ipuch
committed
clean(joint-ellipsoid): unused variables and warnings
precomitted
1 parent dd80ec0 commit 6edb477

File tree

1 file changed

+9
-30
lines changed

1 file changed

+9
-30
lines changed

include/pinocchio/multibody/joint/joint-ellipsoid.hpp

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ namespace pinocchio
142142
}
143143

144144
JointModelEllipsoidTpl()
145+
: radius_a(Scalar(0.01))
146+
, radius_b(Scalar(0.01))
147+
, radius_c(Scalar(0.01))
145148
{
146-
radius_a = Scalar(0.01);
147-
radius_b = Scalar(0.01);
148-
radius_c = Scalar(0.01);
149149
}
150150

151151
explicit JointModelEllipsoidTpl(const Scalar & a, const Scalar & b, const Scalar & c)
@@ -177,12 +177,7 @@ namespace pinocchio
177177
Scalar c2, s2;
178178
SINCOS(data.joint_q(2), &s2, &c2);
179179

180-
// common operations
181-
Scalar c1c2, c1s2;
182-
c1c2 = c1 * c2;
183-
c1s2 = c1 * s2;
184-
185-
data.M.rotation() << c1c2, -c1s2, s1, c0 * s2 + c2 * s0 * s1, c0 * c2 - s0 * s1 * s2,
180+
data.M.rotation() << c1 * c2, -c1 * s2, s1, c0 * s2 + c2 * s0 * s1, c0 * c2 - s0 * s1 * s2,
186181
-c1 * s0, -c0 * c2 * s1 + s0 * s2, c0 * s1 * s2 + c2 * s0, c0 * c1;
187182

188183
Scalar nx, ny, nz;
@@ -210,10 +205,6 @@ namespace pinocchio
210205
Scalar c2, s2;
211206
SINCOS(data.joint_q(2), &s2, &c2);
212207

213-
Scalar c1c2, c1s2;
214-
c1c2 = c1 * c2;
215-
c1s2 = c1 * s2;
216-
217208
Scalar dndotx_dqdot1, dndoty_dqdot0, dndoty_dqdot1, dndotz_dqdot0, dndotz_dqdot1;
218209
dndotx_dqdot1 = c1;
219210
dndoty_dqdot0 = -c0 * c1;
@@ -250,12 +241,7 @@ namespace pinocchio
250241
Scalar c2, s2;
251242
SINCOS(data.joint_q(2), &s2, &c2);
252243

253-
// common operations
254-
Scalar c1c2, c1s2;
255-
c1c2 = c1 * c2;
256-
c1s2 = c1 * s2;
257-
258-
data.M.rotation() << c1c2, -c1s2, s1, c0 * s2 + c2 * s0 * s1, c0 * c2 - s0 * s1 * s2,
244+
data.M.rotation() << c1 * c2, -c1 * s2, s1, c0 * s2 + c2 * s0 * s1, c0 * c2 - s0 * s1 * s2,
259245
-c1 * s0, -c0 * c2 * s1 + s0 * s2, c0 * s1 * s2 + c2 * s0, c0 * c1;
260246

261247
Scalar nx, ny, nz;
@@ -418,9 +404,6 @@ namespace pinocchio
418404
const Scalar & c2,
419405
JointDataDerived & data) const
420406
{
421-
// Common operations
422-
const Scalar c1c2 = c1 * c2;
423-
const Scalar c1s2 = c1 * s2;
424407

425408
Scalar dndotx_dqdot1, dndoty_dqdot0, dndoty_dqdot1, dndotz_dqdot0, dndotz_dqdot1;
426409
dndotx_dqdot1 = c1;
@@ -447,10 +430,6 @@ namespace pinocchio
447430
const Scalar & dndotz_dqdot1,
448431
JointDataDerived & data) const
449432
{
450-
// Common operations
451-
const Scalar c1c2 = c1 * c2;
452-
const Scalar c1s2 = c1 * s2;
453-
454433
Scalar S_11, S_21, S_31, S_12, S_22, S_32;
455434

456435
S_11 = dndoty_dqdot0 * radius_b * (c0 * s2 + c2 * s0 * s1)
@@ -472,8 +451,8 @@ namespace pinocchio
472451
S_32 = dndotx_dqdot1 * radius_a * s1 - dndoty_dqdot1 * radius_b * c1 * s0
473452
+ dndotz_dqdot1 * radius_c * c0 * c1;
474453

475-
data.S.matrix() << S_11, S_12, Scalar(0), S_21, S_22, Scalar(0), S_31, S_32, Scalar(0), c1c2,
476-
s2, Scalar(0), -c1s2, c2, Scalar(0), s1, Scalar(0), Scalar(1);
454+
data.S.matrix() << S_11, S_12, Scalar(0), S_21, S_22, Scalar(0), S_31, S_32, Scalar(0),
455+
c1 * c2, s2, Scalar(0), -c1 * s2, c2, Scalar(0), s1, Scalar(0), Scalar(1);
477456
}
478457
void computeMotionSubspaceDerivative(
479458
const Scalar & s0,
@@ -505,13 +484,13 @@ namespace pinocchio
505484
Scalar d_dndoty_dqdot0_dq0 = s0 * c1; // dndoty_dqdot0 = - c0 * c1;
506485
Scalar d_dndoty_dqdot0_dq1 = c0 * s1;
507486

508-
Scalar d_dndoty_dqdot1_dq0 = c0 * s1; // dndoty_dqdot1 = s0 * s1;
487+
// Scalar d_dndoty_dqdot1_dq0 = c0 * s1; // dndoty_dqdot1 = s0 * s1;
509488
Scalar d_dndoty_dqdot1_dq1 = s0 * c1;
510489

511490
Scalar d_dndotz_dqdot0_dq0 = -c1 * c0; // dndotz_dqdot0 = - c1 * s0;
512491
Scalar d_dndotz_dqdot0_dq1 = s0 * s1;
513492

514-
Scalar d_dndotz_dqdot1_dq0 = s0 * s1; // dndotz_dqdot1 = - c0 * s1;
493+
// Scalar d_dndotz_dqdot1_dq0 = s0 * s1; // dndotz_dqdot1 = - c0 * s1;
515494
Scalar d_dndotz_dqdot1_dq1 = -c0 * c1;
516495

517496
// Upper part (translation)

0 commit comments

Comments
 (0)