diff options
| -rw-r--r-- | Eigen/src/SparseLU/SparseLU.h | 6 | ||||
| -rw-r--r-- | Eigen/src/SparseLU/SparseLU_panel_bmod.h | 2 | ||||
| -rw-r--r-- | Eigen/src/SparseLU/SparseLU_panel_dfs.h | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/Eigen/src/SparseLU/SparseLU.h b/Eigen/src/SparseLU/SparseLU.h index 8fbb794ff..3bd85930c 100644 --- a/Eigen/src/SparseLU/SparseLU.h +++ b/Eigen/src/SparseLU/SparseLU.h @@ -234,7 +234,7 @@ class SparseLU { for (jcol = fsupc; jcol < fsupc + nsupc; jcol++) { - for (i = m_Ustore.outerIndexPtr()[jcol]; i < m_Ustore.outerIndexPtr()[jcol]; i++) + for (i = m_Ustore.outerIndexPtr()[jcol]; i < m_Ustore.outerIndexPtr()[jcol+1]; i++) { irow = m_Ustore.innerIndexPtr()[i]; X(irow, j) -= X(jcol, j) * m_Ustore.valuePtr()[i]; @@ -454,7 +454,7 @@ void SparseLU<MatrixType, OrderingType>::factorize(const MatrixType& matrix) IndexVector xplore(m); IndexVector repfnz(maxpanel); IndexVector panel_lsub(maxpanel); - IndexVector xprune(n); + IndexVector xprune(n); xprune.setZero(); IndexVector marker(m*LU_NO_MARKER); repfnz.setConstant(-1); @@ -642,7 +642,7 @@ void SparseLU<MatrixType, OrderingType>::factorize(const MatrixType& matrix) for (i = 0; i < nseg; i++) { irep = segrep(i); - repfnz(irep) = IND_EMPTY; + repfnz_k(irep) = IND_EMPTY; } } // end SparseLU within the panel jcol += panel_size; // Move to the next panel diff --git a/Eigen/src/SparseLU/SparseLU_panel_bmod.h b/Eigen/src/SparseLU/SparseLU_panel_bmod.h index 9861efa2c..59ec69ec8 100644 --- a/Eigen/src/SparseLU/SparseLU_panel_bmod.h +++ b/Eigen/src/SparseLU/SparseLU_panel_bmod.h @@ -132,7 +132,6 @@ void LU_panel_bmod(const int m, const int w, const int jcol, const int nseg, Sca luptr += nsupr * no_zeros + no_zeros; // triangular solve with Eigen Map<Matrix<Scalar,Dynamic, Dynamic>, 0, OuterStride<> > A( &(lusup.data()[luptr]), segsize, segsize, OuterStride<>(nsupr) ); - std::cout<< " Matrix \n" << A << std::endl; VectorBlock<ScalarVector> u(tempv, 0, segsize); u = A.template triangularView<UnitLower>().solve(u); @@ -165,7 +164,6 @@ void LU_panel_bmod(const int m, const int w, const int jcol, const int nseg, Sca l(i) = Scalar(0); ++isub; } - std::cout<< jj << " : " << dense_col.transpose() << std::endl; } // End for each column in the panel } // End for each updating supernode diff --git a/Eigen/src/SparseLU/SparseLU_panel_dfs.h b/Eigen/src/SparseLU/SparseLU_panel_dfs.h index f7a93ab48..908ee67ac 100644 --- a/Eigen/src/SparseLU/SparseLU_panel_dfs.h +++ b/Eigen/src/SparseLU/SparseLU_panel_dfs.h @@ -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 sup²ernode-representative krep + // krow is in U : if its supernode-representative krep // has been explored, update repfnz(*) krep = xsup(supno(kperm)+1) - 1; myfnz = repfnz_col(krep); |