Fixed compilation of MatrixFunctions module.

This commit is contained in:
Hauke Heibel 2010-01-20 11:32:13 +01:00
parent d5d5417062
commit 89ee9f092f

View File

@ -198,7 +198,7 @@ class MatrixFunction<MatrixType, 1>
void permuteSchur(); void permuteSchur();
void swapEntriesInSchur(int index); void swapEntriesInSchur(int index);
void computeBlockAtomic(); void computeBlockAtomic();
Block<MatrixType> block(const MatrixType& A, int i, int j); typename BlockReturnType<MatrixType>::Type block(const MatrixType& A, int i, int j);
void computeOffDiagonal(); void computeOffDiagonal();
DynMatrixType solveTriangularSylvester(const DynMatrixType& A, const DynMatrixType& B, const DynMatrixType& C); DynMatrixType solveTriangularSylvester(const DynMatrixType& A, const DynMatrixType& B, const DynMatrixType& C);
@ -311,7 +311,7 @@ void MatrixFunction<MatrixType,1>::computeClusterSize()
{ {
const int rows = m_T.rows(); const int rows = m_T.rows();
VectorType diag = m_T.diagonal(); VectorType diag = m_T.diagonal();
const int numClusters = m_clusters.size(); const int numClusters = static_cast<int>(m_clusters.size());
m_clusterSize.setZero(numClusters); m_clusterSize.setZero(numClusters);
m_eivalToCluster.resize(rows); m_eivalToCluster.resize(rows);
@ -400,7 +400,7 @@ void MatrixFunction<MatrixType,1>::computeBlockAtomic()
/** \brief Return block of matrix according to blocking given by #m_blockStart */ /** \brief Return block of matrix according to blocking given by #m_blockStart */
template <typename MatrixType> template <typename MatrixType>
Block<MatrixType> MatrixFunction<MatrixType,1>::block(const MatrixType& A, int i, int j) typename BlockReturnType<MatrixType>::Type MatrixFunction<MatrixType,1>::block(const MatrixType& A, int i, int j)
{ {
return A.block(m_blockStart(i), m_blockStart(j), m_clusterSize(i), m_clusterSize(j)); return A.block(m_blockStart(i), m_blockStart(j), m_clusterSize(i), m_clusterSize(j));
} }