diff options
author | Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-12-18 21:04:06 +0000 |
---|---|---|
committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-12-18 21:04:06 +0000 |
commit | f34a4fa3358133e05afcf0845a58497d16436977 (patch) | |
tree | 81643bc7ca9c1d879c3488758ccf1a2d6b1a5f4e /Eigen/src/Geometry | |
parent | 8106d354089d5699d37f1e3ed16709bc9a0334e5 (diff) |
* forgot to svn add 2 files
* idea of Keir Mierle: make the static assert error msgs UPPERCASE
Diffstat (limited to 'Eigen/src/Geometry')
-rw-r--r-- | Eigen/src/Geometry/Rotation2D.h | 2 | ||||
-rw-r--r-- | Eigen/src/Geometry/RotationBase.h | 4 | ||||
-rw-r--r-- | Eigen/src/Geometry/Transform.h | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Eigen/src/Geometry/Rotation2D.h b/Eigen/src/Geometry/Rotation2D.h index 6bc7328ea..f638ee245 100644 --- a/Eigen/src/Geometry/Rotation2D.h +++ b/Eigen/src/Geometry/Rotation2D.h @@ -140,7 +140,7 @@ template<typename Scalar> template<typename Derived> Rotation2D<Scalar>& Rotation2D<Scalar>::fromRotationMatrix(const MatrixBase<Derived>& mat) { - EIGEN_STATIC_ASSERT(Derived::RowsAtCompileTime==2 && Derived::ColsAtCompileTime==2,you_made_a_programming_mistake) + EIGEN_STATIC_ASSERT(Derived::RowsAtCompileTime==2 && Derived::ColsAtCompileTime==2,YOU_MADE_A_PROGRAMMING_MISTAKE) m_angle = ei_atan2(mat.coeff(1,0), mat.coeff(0,0)); return *this; } diff --git a/Eigen/src/Geometry/RotationBase.h b/Eigen/src/Geometry/RotationBase.h index 6ad057e03..5fec0f18d 100644 --- a/Eigen/src/Geometry/RotationBase.h +++ b/Eigen/src/Geometry/RotationBase.h @@ -116,7 +116,7 @@ Matrix<_Scalar, _Rows, _Cols, _Storage, _MaxRows, _MaxCols> template<typename Scalar, int Dim> inline static Matrix<Scalar,2,2> ei_toRotationMatrix(const Scalar& s) { - EIGEN_STATIC_ASSERT(Dim==2,you_made_a_programming_mistake) + EIGEN_STATIC_ASSERT(Dim==2,YOU_MADE_A_PROGRAMMING_MISTAKE) return Rotation2D<Scalar>(s).toRotationMatrix(); } @@ -130,7 +130,7 @@ template<typename Scalar, int Dim, typename OtherDerived> inline static const MatrixBase<OtherDerived>& ei_toRotationMatrix(const MatrixBase<OtherDerived>& mat) { EIGEN_STATIC_ASSERT(OtherDerived::RowsAtCompileTime==Dim && OtherDerived::ColsAtCompileTime==Dim, - you_made_a_programming_mistake) + YOU_MADE_A_PROGRAMMING_MISTAKE) return mat; } diff --git a/Eigen/src/Geometry/Transform.h b/Eigen/src/Geometry/Transform.h index 8be2df67a..b6ce81c6e 100644 --- a/Eigen/src/Geometry/Transform.h +++ b/Eigen/src/Geometry/Transform.h @@ -307,7 +307,7 @@ Transform<Scalar,Dim>::Transform(const QMatrix& other) template<typename Scalar, int Dim> Transform<Scalar,Dim>& Transform<Scalar,Dim>::operator=(const QMatrix& other) { - EIGEN_STATIC_ASSERT(Dim==2, you_made_a_programming_mistake) + EIGEN_STATIC_ASSERT(Dim==2, YOU_MADE_A_PROGRAMMING_MISTAKE) m_matrix << other.m11(), other.m21(), other.dx(), other.m12(), other.m22(), other.dy(), 0, 0, 1; @@ -323,7 +323,7 @@ Transform<Scalar,Dim>& Transform<Scalar,Dim>::operator=(const QMatrix& other) template<typename Scalar, int Dim> QMatrix Transform<Scalar,Dim>::toQMatrix(void) const { - EIGEN_STATIC_ASSERT(Dim==2, you_made_a_programming_mistake) + EIGEN_STATIC_ASSERT(Dim==2, YOU_MADE_A_PROGRAMMING_MISTAKE) return QMatrix(other.coeffRef(0,0), other.coeffRef(1,0), other.coeffRef(0,1), other.coeffRef(1,1), other.coeffRef(0,2), other.coeffRef(1,2)); @@ -346,7 +346,7 @@ Transform<Scalar,Dim>::Transform(const QTransform& other) template<typename Scalar, int Dim> Transform<Scalar,Dim>& Transform<Scalar,Dim>::operator=(const QTransform& other) { - EIGEN_STATIC_ASSERT(Dim==2, you_made_a_programming_mistake) + EIGEN_STATIC_ASSERT(Dim==2, YOU_MADE_A_PROGRAMMING_MISTAKE) m_matrix << other.m11(), other.m21(), other.dx(), other.m12(), other.m22(), other.dy(), other.m13(), other.m23(), other.m33(); @@ -360,7 +360,7 @@ Transform<Scalar,Dim>& Transform<Scalar,Dim>::operator=(const QTransform& other) template<typename Scalar, int Dim> QMatrix Transform<Scalar,Dim>::toQTransform(void) const { - EIGEN_STATIC_ASSERT(Dim==2, you_made_a_programming_mistake) + EIGEN_STATIC_ASSERT(Dim==2, YOU_MADE_A_PROGRAMMING_MISTAKE) return QTransform(other.coeffRef(0,0), other.coeffRef(1,0), other.coeffRef(2,0) other.coeffRef(0,1), other.coeffRef(1,1), other.coeffRef(2,1) other.coeffRef(0,2), other.coeffRef(1,2), other.coeffRef(2,2); @@ -501,7 +501,7 @@ template<typename Scalar, int Dim> Transform<Scalar,Dim>& Transform<Scalar,Dim>::shear(Scalar sx, Scalar sy) { - EIGEN_STATIC_ASSERT(int(Dim)==2, you_made_a_programming_mistake) + EIGEN_STATIC_ASSERT(int(Dim)==2, YOU_MADE_A_PROGRAMMING_MISTAKE) VectorType tmp = linear().col(0)*sy + linear().col(1); linear() << linear().col(0) + linear().col(1)*sx, tmp; return *this; @@ -516,7 +516,7 @@ template<typename Scalar, int Dim> Transform<Scalar,Dim>& Transform<Scalar,Dim>::preshear(Scalar sx, Scalar sy) { - EIGEN_STATIC_ASSERT(int(Dim)==2, you_made_a_programming_mistake) + EIGEN_STATIC_ASSERT(int(Dim)==2, YOU_MADE_A_PROGRAMMING_MISTAKE) m_matrix.template block<Dim,HDim>(0,0) = LinearMatrixType(1, sx, sy, 1) * m_matrix.template block<Dim,HDim>(0,0); return *this; } |