GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-11 19:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix MSVC compile error in SparseLU

Browse Source
This commit is contained in:
Desire NUENTSA 2012-09-25 09:58:29 +02:00
parent a01371548d
commit 088379ac2f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/SparseLU/SparseLU.h
View File

@ -470,7 +470,7 @@ void SparseLU<MatrixType, OrderingType>::factorize(const MatrixType& matrix)
// Adjust panel size so that a panel won't overlap with the next relaxed snode. // Adjust panel size so that a panel won't overlap with the next relaxed snode.
int panel_size = m_perfv.panel_size; // upper bound on panel width int panel_size = m_perfv.panel_size; // upper bound on panel width
for (k = jcol + 1; k < std::min(jcol+panel_size, n); k++) for (k = jcol + 1; k < (std::min)(jcol+panel_size, n); k++)
{ {
if (relax_end(k) != IND_EMPTY) if (relax_end(k) != IND_EMPTY)
{ {

2
Eigen/src/SparseLU/SparseLU_Memory.h
View File

@ -32,7 +32,7 @@
#define EIGEN_SPARSELU_MEMORY #define EIGEN_SPARSELU_MEMORY
#define LU_NO_MARKER 3 #define LU_NO_MARKER 3
#define LU_NUM_TEMPV(m,w,t,b) (std::max(m, (t+b)*w) ) #define LU_NUM_TEMPV(m,w,t,b) ((std::max)(m, (t+b)*w) )
#define IND_EMPTY (-1) #define IND_EMPTY (-1)
#define LU_Reduce(alpha) ((alpha + 1) / 2) // i.e (alpha-1)/2 + 1 #define LU_Reduce(alpha) ((alpha + 1) / 2) // i.e (alpha-1)/2 + 1