Skip to content
Snippets Groups Projects
Commit 74cb2c6f authored by Justin Carpentier's avatar Justin Carpentier
Browse files

[wip/pinocchio] Fix bug related to Eigen 3.3.x

parent 2032ff43
No related branches found
No related tags found
No related merge requests found
...@@ -12,6 +12,7 @@ MAINTAINER= gepetto@laas.fr ...@@ -12,6 +12,7 @@ MAINTAINER= gepetto@laas.fr
CATEGORIES= math CATEGORIES= math
COMMENT= Efficient rigid body dynamics COMMENT= Efficient rigid body dynamics
LICENSE= gnu-lgpl-v3 LICENSE= gnu-lgpl-v3
PKGREVISION= 1
# parallel builds would consume all memory because of the g++ process size # parallel builds would consume all memory because of the g++ process size
MAKE_JOBS_SAFE= no MAKE_JOBS_SAFE= no
......
SHA1 (pinocchio-1.2.5.tar.gz) = 4a3e45b3154bf703c8822d2c3c49e32b92edf90e SHA1 (pinocchio-1.2.5.tar.gz) = 4a3e45b3154bf703c8822d2c3c49e32b92edf90e
RMD160 (pinocchio-1.2.5.tar.gz) = b03d35e0f0abd1564ba8f44bb08b029dccc4dd1c RMD160 (pinocchio-1.2.5.tar.gz) = b03d35e0f0abd1564ba8f44bb08b029dccc4dd1c
Size (pinocchio-1.2.5.tar.gz) = 9003067 bytes Size (pinocchio-1.2.5.tar.gz) = 9003067 bytes
SHA1 (patch-aa) = d122db98550c7615572a07454e5801508f2c3a77
diff --git src/spatial/inertia.hpp src/spatial/inertia.hpp
index 809e1c2..7b33c7b 100644
--- src/spatial/inertia.hpp
+++ src/spatial/inertia.hpp
@@ -238,7 +238,7 @@ namespace se3
M.template block<3,3>(LINEAR, LINEAR ).diagonal ().fill (m);
M.template block<3,3>(ANGULAR,LINEAR ) = alphaSkew(m,c);
M.template block<3,3>(LINEAR, ANGULAR) = -M.template block<3,3> (ANGULAR, LINEAR);
- M.template block<3,3>(ANGULAR,ANGULAR) = (typename Symmetric3::Matrix3)(I - AlphaSkewSquare(m,c));
+ M.template block<3,3>(ANGULAR,ANGULAR) = (I - AlphaSkewSquare(m,c)).matrix();
return M;
}
@@ -320,7 +320,7 @@ namespace se3
res.template block<3,3>(ANGULAR,ANGULAR) = res.template block<3,3>(LINEAR,LINEAR) - res.template block<3,3>(LINEAR,LINEAR).transpose();
res.template block<3,3>(ANGULAR,ANGULAR) = -skewSquare(mv.linear(),c) - skewSquare(c,mv.linear());
- res.template block<3,3>(LINEAR,LINEAR) = (typename Symmetric3::Matrix3)(I - AlphaSkewSquare(m,c));
+ res.template block<3,3>(LINEAR,LINEAR) = (typename Symmetric3::Matrix3)(I - AlphaSkewSquare(m,c)).matrix();
res.template block<3,3>(ANGULAR,ANGULAR) -= res.template block<3,3>(LINEAR,LINEAR) * skew(v.angular());
res.template block<3,3>(ANGULAR,ANGULAR) += cross(v.angular(),res.template block<3,3>(LINEAR,LINEAR));
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