mark more methods as const. also rename, Numeric.h->NumTraits.h

This commit is contained in:
Benoit Jacob 2007-10-13 20:53:30 +00:00
parent e445f5085a
commit 5f0af72abc
6 changed files with 11 additions and 10 deletions

View File

@ -6,7 +6,7 @@
namespace Eigen { namespace Eigen {
#include "Core/Util.h" #include "Core/Util.h"
#include "Core/Numeric.h" #include "Core/NumTraits.h"
#include "Core/Object.h" #include "Core/Object.h"
#include "Core/CopyHelper.h" #include "Core/CopyHelper.h"
#include "Core/MatrixRef.h" #include "Core/MatrixRef.h"

View File

@ -76,9 +76,10 @@ template<typename MatrixType> class Block
template<typename Scalar, typename Derived> template<typename Scalar, typename Derived>
Block<Derived> Block<Derived>
Object<Scalar, Derived>::block(int startRow, int endRow, int startCol, int endCol) Object<Scalar, Derived>::block(int startRow, int endRow, int startCol, int endCol) const
{ {
return Block<Derived>(static_cast<Derived*>(this)->ref(), startRow, endRow, startCol, endCol); return Block<Derived>(static_cast<Derived*>(const_cast<Object*>(this))->ref(),
startRow, endRow, startCol, endCol);
} }
#endif // EI_BLOCK_H #endif // EI_BLOCK_H

View File

@ -75,9 +75,9 @@ template<typename MatrixType> class Minor
template<typename Scalar, typename Derived> template<typename Scalar, typename Derived>
Minor<Derived> Minor<Derived>
Object<Scalar, Derived>::minor(int row, int col) Object<Scalar, Derived>::minor(int row, int col) const
{ {
return Minor<Derived>(static_cast<Derived*>(this)->ref(), row, col); return Minor<Derived>(static_cast<Derived*>(const_cast<Object*>(this))->ref(), row, col);
} }
#endif // EI_MINOR_H #endif // EI_MINOR_H

View File

@ -97,9 +97,9 @@ template<typename Scalar, typename Derived> class Object
Row<Derived> row(int i) const; Row<Derived> row(int i) const;
Column<Derived> col(int i) const; Column<Derived> col(int i) const;
Minor<Derived> minor(int row, int col); Minor<Derived> minor(int row, int col) const;
Block<Derived> block(int startRow, int endRow, int startCol, int endCol); Block<Derived> block(int startRow, int endRow, int startCol, int endCol) const;
Transpose<Derived> transpose(); Transpose<Derived> transpose() const;
Conjugate<Derived> conjugate() const; Conjugate<Derived> conjugate() const;
Transpose<Conjugate<Derived> > adjoint() const { return conjugate().transpose(); } Transpose<Conjugate<Derived> > adjoint() const { return conjugate().transpose(); }
Scalar trace() const; Scalar trace() const;

View File

@ -66,9 +66,9 @@ template<typename MatrixType> class Transpose
template<typename Scalar, typename Derived> template<typename Scalar, typename Derived>
Transpose<Derived> Transpose<Derived>
Object<Scalar, Derived>::transpose() Object<Scalar, Derived>::transpose() const
{ {
return Transpose<Derived>(static_cast<Derived*>(this)->ref()); return Transpose<Derived>(static_cast<Derived*>(const_cast<Object*>(this))->ref());
} }
#endif // EI_TRANSPOSE_H #endif // EI_TRANSPOSE_H