GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-02 02:00:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings

Browse Source
This commit is contained in:
Benoit Jacob 2009-01-21 20:06:16 +00:00
parent 52cf07d266
commit 7ccea9222c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/Core/util/DisableMSVCWarnings.h
View File

@ -1,5 +1,5 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4181 4244 4127 4211 ) #pragma warning( disable : 4181 4244 4127 4211 4717 )
#endif #endif

20
test/geometry.cpp
View File

@ -95,7 +95,7 @@ template<typename Scalar> void geometry(void)
// angular distance // angular distance
Scalar refangle = ei_abs(AngleAxisx(q1.inverse()*q2).angle()); Scalar refangle = ei_abs(AngleAxisx(q1.inverse()*q2).angle());
if (refangle>Scalar(M_PI)) if (refangle>Scalar(M_PI))
refangle = 2.*Scalar(M_PI) - refangle; refangle = Scalar(2)*Scalar(M_PI) - refangle;
VERIFY(ei_isApprox(q1.angularDistance(q2), refangle, largeEps)); VERIFY(ei_isApprox(q1.angularDistance(q2), refangle, largeEps));
// rotation matrix conversion // rotation matrix conversion
@ -109,13 +109,13 @@ template<typename Scalar> void geometry(void)
q2 = q1.toRotationMatrix(); q2 = q1.toRotationMatrix();
VERIFY_IS_APPROX(q1*v1,q2*v1); VERIFY_IS_APPROX(q1*v1,q2*v1);
matrot1 = AngleAxisx(0.1, Vector3::UnitX()) matrot1 = AngleAxisx(Scalar(0.1), Vector3::UnitX())
* AngleAxisx(0.2, Vector3::UnitY()) * AngleAxisx(Scalar(0.2), Vector3::UnitY())
* AngleAxisx(0.3, Vector3::UnitZ()); * AngleAxisx(Scalar(0.3), Vector3::UnitZ());
VERIFY_IS_APPROX(matrot1 * v1, VERIFY_IS_APPROX(matrot1 * v1,
AngleAxisx(0.1, Vector3(1,0,0)).toRotationMatrix() AngleAxisx(Scalar(0.1), Vector3(1,0,0)).toRotationMatrix()
* (AngleAxisx(0.2, Vector3(0,1,0)).toRotationMatrix() * (AngleAxisx(Scalar(0.2), Vector3(0,1,0)).toRotationMatrix()
* (AngleAxisx(0.3, Vector3(0,0,1)).toRotationMatrix() * v1))); * (AngleAxisx(Scalar(0.3), Vector3(0,0,1)).toRotationMatrix() * v1)));
// angle-axis conversion // angle-axis conversion
AngleAxisx aa = q1; AngleAxisx aa = q1;
@ -143,8 +143,8 @@ template<typename Scalar> void geometry(void)
// Transform // Transform
// TODO complete the tests ! // TODO complete the tests !
a = 0; a = 0;
while (ei_abs(a)<0.1) while (ei_abs(a)<Scalar(0.1))
a = ei_random<Scalar>(-0.4*Scalar(M_PI), 0.4*Scalar(M_PI)); a = ei_random<Scalar>(-Scalar(0.4)*Scalar(M_PI), Scalar(0.4)*Scalar(M_PI));
q1 = AngleAxisx(a, v0.normalized()); q1 = AngleAxisx(a, v0.normalized());
Transform3 t0, t1, t2; Transform3 t0, t1, t2;
t0.setIdentity(); t0.setIdentity();
@ -241,7 +241,7 @@ template<typename Scalar> void geometry(void)
Vector2 v20 = Vector2::Random(); Vector2 v20 = Vector2::Random();
Vector2 v21 = Vector2::Random(); Vector2 v21 = Vector2::Random();
for (int k=0; k<2; ++k) for (int k=0; k<2; ++k)
if (ei_abs(v21[k])<1e-3) v21[k] = 1e-3; if (ei_abs(v21[k])<Scalar(1e-3)) v21[k] = Scalar(1e-3);
t21.setIdentity(); t21.setIdentity();
t21.linear() = Rotation2D<Scalar>(a).toRotationMatrix(); t21.linear() = Rotation2D<Scalar>(a).toRotationMatrix();
VERIFY_IS_APPROX(t20.fromPositionOrientationScale(v20,a,v21).matrix(), VERIFY_IS_APPROX(t20.fromPositionOrientationScale(v20,a,v21).matrix(),