diff options
author | Desire NUENTSA <desire.nuentsa_wakam@inria.fr> | 2012-06-14 18:45:04 +0200 |
---|---|---|
committer | Desire NUENTSA <desire.nuentsa_wakam@inria.fr> | 2012-06-14 18:45:04 +0200 |
commit | 0c9b08e46e7507d9f13200f0702bc57ed6aae52c (patch) | |
tree | bc319fe32b4bdfa8dd601082e25c508606f53853 /Eigen/src/SparseLU/SparseLU_panel_dfs.h | |
parent | f8a0745cb0426eb3095dbea24288a64eddab04f0 (diff) |
build complete... almost
Diffstat (limited to 'Eigen/src/SparseLU/SparseLU_panel_dfs.h')
-rw-r--r-- | Eigen/src/SparseLU/SparseLU_panel_dfs.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Eigen/src/SparseLU/SparseLU_panel_dfs.h b/Eigen/src/SparseLU/SparseLU_panel_dfs.h index 6f6922ee0..f7a93ab48 100644 --- a/Eigen/src/SparseLU/SparseLU_panel_dfs.h +++ b/Eigen/src/SparseLU/SparseLU_panel_dfs.h @@ -77,8 +77,8 @@ * * */ -template <typename MatrixType, typename IndexVector, typename ScalarVector> -void LU_panel_dfs(const int m, const int w, const int jcol, MatrixType& A, IndexVector& perm_r, int& nseg, ScalarVector& dense, IndexVector& panel_lsub, IndexVector& segrep, IndexVector& repfnz, IndexVector& xprune, IndexVector& marker, IndexVector& parent, IndexVector& xplore, LU_GlobalLU_t<IndexVector, ScalarVector>& glu) +template <typename MatrixType, typename ScalarVector, typename IndexVector> +void LU_panel_dfs(const int m, const int w, const int jcol, MatrixType& A, IndexVector& perm_r, int& nseg, ScalarVector& dense, IndexVector& panel_lsub, IndexVector& segrep, IndexVector& repfnz, IndexVector& xprune, IndexVector& marker, IndexVector& parent, IndexVector& xplore, LU_GlobalLU_t<IndexVector, ScalarVector>& glu) { int jj; // Index through each column in the panel @@ -105,14 +105,14 @@ void LU_panel_dfs(const int m, const int w, const int jcol, MatrixType& A, Index nextl_col = (jj - jcol) * m; VectorBlock<IndexVector> repfnz_col(repfnz, nextl_col, m); // First nonzero location in each row - VectorBlock<IndexVector> dense_col(dense,nextl_col, m); // Accumulate a column vector here + VectorBlock<ScalarVector> dense_col(dense,nextl_col, m); // Accumulate a column vector here // For each nnz in A[*, jj] do depth first search for (typename MatrixType::InnerIterator it(A, jj); it; ++it) { krow = it.row(); - dense_col(krow) = it.val(); + dense_col(krow) = it.value(); kmark = marker(krow); if (kmark == jj) continue; // krow visited before, go to the next nonzero @@ -126,7 +126,7 @@ void LU_panel_dfs(const int m, const int w, const int jcol, MatrixType& A, Index } else { - // krow is in U : if its supernode-representative krep + // krow is in U : if its supĀ²ernode-representative krep // has been explored, update repfnz(*) krep = xsup(supno(kperm)+1) - 1; myfnz = repfnz_col(krep); |