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

move default parameter values from function definition to function declaration.

Browse Source 
doxygen likes it and this fixes compilation on ICC.
This commit is contained in:
Benoit Jacob 2008-01-06 19:34:28 +00:00
parent 84934ea217
commit 5111ace0d6
7 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/Core/DiagonalMatrix.h
View File

@ -98,7 +98,7 @@ MatrixBase<Scalar, Derived>::asDiagonal() const
*/ */
template<typename Scalar, typename Derived> template<typename Scalar, typename Derived>
bool MatrixBase<Scalar, Derived>::isDiagonal bool MatrixBase<Scalar, Derived>::isDiagonal
(typename NumTraits<Scalar>::Real prec = precision<Scalar>()) const (typename NumTraits<Scalar>::Real prec) const
{ {
if(cols() != rows()) return false; if(cols() != rows()) return false;
RealScalar maxAbsOnDiagonal = static_cast<RealScalar>(-1); RealScalar maxAbsOnDiagonal = static_cast<RealScalar>(-1);

4
Eigen/src/Core/Dot.h
View File

@ -138,7 +138,7 @@ template<typename Scalar, typename Derived>
template<typename OtherDerived> template<typename OtherDerived>
bool MatrixBase<Scalar, Derived>::isOrtho bool MatrixBase<Scalar, Derived>::isOrtho
(const OtherDerived& other, (const OtherDerived& other,
typename NumTraits<Scalar>::Real prec = precision<Scalar>()) const typename NumTraits<Scalar>::Real prec) const
{ {
return abs2(dot(other)) <= prec * prec * norm2() * other.norm2(); return abs2(dot(other)) <= prec * prec * norm2() * other.norm2();
} }
@ -156,7 +156,7 @@ bool MatrixBase<Scalar, Derived>::isOrtho
*/ */
template<typename Scalar, typename Derived> template<typename Scalar, typename Derived>
bool MatrixBase<Scalar, Derived>::isOrtho bool MatrixBase<Scalar, Derived>::isOrtho
(typename NumTraits<Scalar>::Real prec = precision<Scalar>()) const (typename NumTraits<Scalar>::Real prec) const
{ {
for(int i = 0; i < cols(); i++) for(int i = 0; i < cols(); i++)
{ {

6
Eigen/src/Core/Fuzzy.h
View File

@ -30,7 +30,7 @@ template<typename Scalar, typename Derived>
template<typename OtherDerived> template<typename OtherDerived>
bool MatrixBase<Scalar, Derived>::isApprox( bool MatrixBase<Scalar, Derived>::isApprox(
const OtherDerived& other, const OtherDerived& other,
typename NumTraits<Scalar>::Real prec = precision<Scalar>() typename NumTraits<Scalar>::Real prec
) const ) const
{ {
assert(rows() == other.rows() && cols() == other.cols()); assert(rows() == other.rows() && cols() == other.cols());
@ -51,7 +51,7 @@ bool MatrixBase<Scalar, Derived>::isApprox(
template<typename Scalar, typename Derived> template<typename Scalar, typename Derived>
bool MatrixBase<Scalar, Derived>::isMuchSmallerThan( bool MatrixBase<Scalar, Derived>::isMuchSmallerThan(
const typename NumTraits<Scalar>::Real& other, const typename NumTraits<Scalar>::Real& other,
typename NumTraits<Scalar>::Real prec = precision<Scalar>() typename NumTraits<Scalar>::Real prec
) const ) const
{ {
if(Traits::IsVectorAtCompileTime) if(Traits::IsVectorAtCompileTime)
@ -71,7 +71,7 @@ template<typename Scalar, typename Derived>
template<typename OtherDerived> template<typename OtherDerived>
bool MatrixBase<Scalar, Derived>::isMuchSmallerThan( bool MatrixBase<Scalar, Derived>::isMuchSmallerThan(
const MatrixBase<Scalar, OtherDerived>& other, const MatrixBase<Scalar, OtherDerived>& other,
typename NumTraits<Scalar>::Real prec = precision<Scalar>() typename NumTraits<Scalar>::Real prec
) const ) const
{ {
assert(rows() == other.rows() && cols() == other.cols()); assert(rows() == other.rows() && cols() == other.cols());

2
Eigen/src/Core/Identity.h
View File

@ -92,7 +92,7 @@ const Identity<Derived> MatrixBase<Scalar, Derived>::identity(int rows)
*/ */
template<typename Scalar, typename Derived> template<typename Scalar, typename Derived>
bool MatrixBase<Scalar, Derived>::isIdentity bool MatrixBase<Scalar, Derived>::isIdentity
(typename NumTraits<Scalar>::Real prec = precision<Scalar>()) const (typename NumTraits<Scalar>::Real prec) const
{ {
if(cols() != rows()) return false; if(cols() != rows()) return false;
for(int j = 0; j < cols(); j++) for(int j = 0; j < cols(); j++)

32
Eigen/src/Core/MatrixBase.h
View File

@ -59,6 +59,7 @@ template<typename Scalar, typename Derived> class MatrixBase
public: public:
/** \brief Some traits provided by the Derived type. /** \brief Some traits provided by the Derived type.
*
* Grouping these in a nested subclass is what was needed for ICC compatibility. */ * Grouping these in a nested subclass is what was needed for ICC compatibility. */
struct Traits struct Traits
{ {
@ -103,17 +104,17 @@ template<typename Scalar, typename Derived> class MatrixBase
* \a Scalar is \a std::complex<T> then RealScalar is \a T. */ * \a Scalar is \a std::complex<T> then RealScalar is \a T. */
typedef typename NumTraits<Scalar>::Real RealScalar; typedef typename NumTraits<Scalar>::Real RealScalar;
/** \returns the number of rows. \sa cols(), DerivedTraits::RowsAtCompileTime */ /** \returns the number of rows. \sa cols(), Traits::RowsAtCompileTime */
int rows() const { return static_cast<const Derived *>(this)->_rows(); } int rows() const { return static_cast<const Derived *>(this)->_rows(); }
/** \returns the number of columns. \sa row(), DerivedTraits::ColsAtCompileTime*/ /** \returns the number of columns. \sa row(), Traits::ColsAtCompileTime*/
int cols() const { return static_cast<const Derived *>(this)->_cols(); } int cols() const { return static_cast<const Derived *>(this)->_cols(); }
/** \returns the number of coefficients, which is \a rows()*cols(). /** \returns the number of coefficients, which is \a rows()*cols().
* \sa rows(), cols(), DerivedTraits::SizeAtCompileTime. */ * \sa rows(), cols(), Traits::SizeAtCompileTime. */
int size() const { return rows() * cols(); } int size() const { return rows() * cols(); }
/** \returns true if either the number of rows or the number of columns is equal to 1. /** \returns true if either the number of rows or the number of columns is equal to 1.
* In other words, this function returns * In other words, this function returns
* \code rows()==1 || cols()==1 \endcode * \code rows()==1 || cols()==1 \endcode
* \sa rows(), cols(), DerivedTraits::IsVectorAtCompileTime. */ * \sa rows(), cols(), Traits::IsVectorAtCompileTime. */
bool isVector() const { return rows()==1 || cols()==1; } bool isVector() const { return rows()==1 || cols()==1; }
/** \returns a Ref to *this. \sa Ref */ /** \returns a Ref to *this. \sa Ref */
Ref ref() const Ref ref() const
@ -163,8 +164,8 @@ template<typename Scalar, typename Derived> class MatrixBase
RealScalar norm() const; RealScalar norm() const;
const ScalarMultiple<RealScalar, Derived> normalized() const; const ScalarMultiple<RealScalar, Derived> normalized() const;
template<typename OtherDerived> template<typename OtherDerived>
bool isOrtho(const OtherDerived& other, RealScalar prec) const; bool isOrtho(const OtherDerived& other, RealScalar prec = precision<Scalar>()) const;
bool isOrtho(RealScalar prec) const; bool isOrtho(RealScalar prec = precision<Scalar>()) const;
static const Eval<Random<Derived> > random(int rows, int cols); static const Eval<Random<Derived> > random(int rows, int cols);
static const Eval<Random<Derived> > random(int size); static const Eval<Random<Derived> > random(int size);
@ -177,10 +178,10 @@ template<typename Scalar, typename Derived> class MatrixBase
static const Ones<Derived> ones(); static const Ones<Derived> ones();
static const Identity<Derived> identity(int rows = Derived::RowsAtCompileTime); static const Identity<Derived> identity(int rows = Derived::RowsAtCompileTime);
bool isZero(RealScalar prec) const; bool isZero(RealScalar prec = precision<Scalar>()) const;
bool isOnes(RealScalar prec) const; bool isOnes(RealScalar prec = precision<Scalar>()) const;
bool isIdentity(RealScalar prec) const; bool isIdentity(RealScalar prec = precision<Scalar>()) const;
bool isDiagonal(RealScalar prec) const; bool isDiagonal(RealScalar prec = precision<Scalar>()) const;
const DiagonalMatrix<Derived> asDiagonal() const; const DiagonalMatrix<Derived> asDiagonal() const;
@ -188,12 +189,13 @@ template<typename Scalar, typename Derived> class MatrixBase
const DiagonalCoeffs<Derived> diagonal() const; const DiagonalCoeffs<Derived> diagonal() const;
template<typename OtherDerived> template<typename OtherDerived>
bool isApprox(const OtherDerived& other, RealScalar prec) const; bool isApprox(const OtherDerived& other,
bool isMuchSmallerThan RealScalar prec = precision<Scalar>()) const;
(const typename NumTraits<Scalar>::Real& other, RealScalar prec) const; bool isMuchSmallerThan(const typename NumTraits<Scalar>::Real& other,
RealScalar prec = precision<Scalar>()) const;
template<typename OtherDerived> template<typename OtherDerived>
bool isMuchSmallerThan bool isMuchSmallerThan(const MatrixBase<Scalar, OtherDerived>& other,
(const MatrixBase<Scalar, OtherDerived>& other, RealScalar prec) const; RealScalar prec = precision<Scalar>()) const;
template<typename OtherDerived> template<typename OtherDerived>
const Product<Derived, OtherDerived> const Product<Derived, OtherDerived>

2
Eigen/src/Core/Ones.h
View File

@ -135,7 +135,7 @@ const Ones<Derived> MatrixBase<Scalar, Derived>::ones()
*/ */
template<typename Scalar, typename Derived> template<typename Scalar, typename Derived>
bool MatrixBase<Scalar, Derived>::isOnes bool MatrixBase<Scalar, Derived>::isOnes
(typename NumTraits<Scalar>::Real prec = precision<Scalar>()) const (typename NumTraits<Scalar>::Real prec) const
{ {
for(int j = 0; j < cols(); j++) for(int j = 0; j < cols(); j++)
for(int i = 0; i < rows(); i++) for(int i = 0; i < rows(); i++)

2
Eigen/src/Core/Zero.h
View File

@ -135,7 +135,7 @@ const Zero<Derived> MatrixBase<Scalar, Derived>::zero()
*/ */
template<typename Scalar, typename Derived> template<typename Scalar, typename Derived>
bool MatrixBase<Scalar, Derived>::isZero bool MatrixBase<Scalar, Derived>::isZero
(typename NumTraits<Scalar>::Real prec = precision<Scalar>()) const (typename NumTraits<Scalar>::Real prec) const
{ {
for(int j = 0; j < cols(); j++) for(int j = 0; j < cols(); j++)
for(int i = 0; i < rows(); i++) for(int i = 0; i < rows(); i++)