Skip to content

Commit

Permalink
add prefix to min and max, to avoid future conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
huiscliu committed Feb 24, 2019
1 parent 196e688 commit 775e41a
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions include/protos-deps.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
extern "C" {
#endif

#ifndef min
#define min(a,b) (((a)>(b))?(b):(a))
#ifndef its_min
#define its_min(a,b) (((a)>(b))?(b):(a))
#endif
#ifndef max
#define max(a,b) (((a)>(b))?(a):(b))
#ifndef its_max
#define its_max(a,b) (((a)>(b))?(a):(b))
#endif

#if defined(_IBM) /* IBM */
Expand Down
10 changes: 5 additions & 5 deletions src/mat-utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ int itsol_CondestC(ITS_ILUSpar *lu, FILE * fp)

itsol_lumsolC(y, x, lu);
for (i = 0; i < n; i++) {
norm = max(norm, fabs(x[i]));
norm = its_max(norm, fabs(x[i]));
}
fprintf(fp, "ILU inf-norm lower bound : %16.2f\n", norm);
free(x);
Expand Down Expand Up @@ -132,7 +132,7 @@ int itsol_invSVD(int nn, double *A)
nrm = S[0] * tol;
/*-------------------- compute S\inv * VT */
for (i = 0; i < nn; i++) {
tmp = one / max(S[i], nrm);
tmp = one / its_max(S[i], nrm);
itsol_dscal(nn, tmp, &VT[i], nn);
}
/*-------------------- do [V^T S\inv ] * U^T */
Expand Down Expand Up @@ -1052,7 +1052,7 @@ int itsol_condestLU(ITS_ILUSpar *lu, FILE * fp)

itsol_lusolC(y, x, lu);

for (i = 0; i < n; i++) norm = max(norm, fabs(x[i]));
for (i = 0; i < n; i++) norm = its_max(norm, fabs(x[i]));

fprintf(fp, "ILU inf-norm lower bound : %16.2f\n", norm);
free(y);
Expand All @@ -1073,7 +1073,7 @@ int itsol_condestArms(ITS_ARMSpar *armspre, double *y, FILE * fp)
itsol_armsol2(y, armspre);

for (i = 0; i < n; i++) {
norm = max(norm, fabs(y[i]));
norm = its_max(norm, fabs(y[i]));
}

fprintf(fp, "ARMS inf-norm lower bound = : %16.2f\n", norm);
Expand All @@ -1095,7 +1095,7 @@ int itsol_VBcondestC(ITS_VBILUSpar *lu, FILE * fp)

itsol_vblusolC(y, x, lu);

for (i = 0; i < ndim; i++) norm = max(norm, fabs(x[i]));
for (i = 0; i < ndim; i++) norm = its_max(norm, fabs(x[i]));

fprintf(fp, "VBILU inf-norm lower bound : %16.2f\n", norm);
free(y);
Expand Down
2 changes: 1 addition & 1 deletion src/pc-iluk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ int itsol_pc_lofC(int lofM, ITS_SparMat *csmat, ITS_ILUSpar *lu, FILE * fp)
}
}
else
levls[ip] = min(levls[ip], it);
levls[ip] = its_min(levls[ip], it);
}
} /* end - while loop */
/*-------------------- reset iw */
Expand Down
16 changes: 8 additions & 8 deletions src/pc-ilutc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static int std_drop(int lfil, int i, double tolL, double tolU, double toldiag)
}
/*-------------------- find the largest lfil elements in row k */
Unnz = len;
len = min(Unnz, lfil);
len = its_min(Unnz, lfil);
for (j = 0; j < Unnz; j++)
w[j] = fabs(wU[Uid[j]]);
FC_FUNC(itsol_qsplit,ITSOL_QSPLIT)(w, Uid, &Unnz, &len);
Expand Down Expand Up @@ -125,7 +125,7 @@ static int std_drop(int lfil, int i, double tolL, double tolU, double toldiag)
}
/*-------------------- find the largest lfil elements in column k */
Lnnz = len;
len = min(Lnnz, lfil);
len = its_min(Lnnz, lfil);
for (j = 0; j < Lnnz; j++) w[j] = fabs(wL[Lid[j]]);

FC_FUNC(itsol_qsplit,ITSOL_QSPLIT)(w, Lid, &Lnnz, &len);
Expand Down Expand Up @@ -454,9 +454,9 @@ int itsol_pc_ilutc(ITS_ILUSpar *mt, ITS_ILUSpar *lu, int lfil, double tol, int d
/*-------------------- drop = 2 */
}
else if (drop == 2) {
Lnorm = tol * diag / max(1, fabs(eL[i]));
Lnorm = tol * diag / its_max(1, fabs(eL[i]));
eU[i] *= D[i];
Unorm = tol / max(1, fabs(eU[i]));
Unorm = tol / its_max(1, fabs(eU[i]));
std_drop(lfil, i, Lnorm, Unorm, toldiag);
/*-------------------- update eL[i+1,...,n] and eU[i+1,...,n] */
t = eL[i] * D[i];
Expand Down Expand Up @@ -485,8 +485,8 @@ int itsol_pc_ilutc(ITS_ILUSpar *mt, ITS_ILUSpar *lu, int lfil, double tol, int d
eU[i] = -1 - eU[i];
}
eU[i] *= D[i];
Lnorm = tol * diag / max(1, fabs(eL[i]));
Unorm = tol / max(1, fabs(eU[i]));
Lnorm = tol * diag / its_max(1, fabs(eL[i]));
Unorm = tol / its_max(1, fabs(eU[i]));
std_drop(lfil, i, Lnorm, Unorm, toldiag);
/*-------------------- update eL[i+1,...,n] and eU[i+1,...,n] */
t = eL[i] * D[i];
Expand Down Expand Up @@ -521,7 +521,7 @@ int itsol_pc_ilutc(ITS_ILUSpar *mt, ITS_ILUSpar *lu, int lfil, double tol, int d
else {
eL[i] = x2;
}
Lnorm = tol * diag / max(1, fabs(eL[i]));
Lnorm = tol * diag / its_max(1, fabs(eL[i]));
x1 = (1 - eU[i]) * D[i];
x2 = (-1 - eU[i]) * D[i];
s1 = s2 = 0.0;
Expand All @@ -541,7 +541,7 @@ int itsol_pc_ilutc(ITS_ILUSpar *mt, ITS_ILUSpar *lu, int lfil, double tol, int d
else {
eU[i] = x2;
}
Unorm = tol / max(1, fabs(eU[i]));
Unorm = tol / its_max(1, fabs(eU[i]));
std_drop(lfil, i, Lnorm, Unorm, toldiag);
/*-------------------- update eL[i+1,...,n] and eU[i+1,...,n] */
t = eL[i] * D[i];
Expand Down
2 changes: 1 addition & 1 deletion src/pc-vbiluk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ int itsol_pc_vblofC(int lofM, ITS_VBSparMat *vbmat, ITS_VBILUSpar *lu, FILE * fp
}
}
else
levls[ip] = min(levls[ip], it);
levls[ip] = its_min(levls[ip], it);
}
} /* end - while loop */
/*-------------------- reset iw */
Expand Down
8 changes: 4 additions & 4 deletions src/pc-vbilut.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ int itsol_pc_vbilutC(ITS_VBSparMat *vbmat, ITS_VBILUSpar *lu, int lfil, double t
for (j = 0; j < nzcount; j++) {
sz = ITS_B_DIM(bsz, ja[j]);
t = itsol_vbnorm2(dim * sz, ba[j]);
tnorm = max(t, tnorm);
tnorm = its_max(t, tnorm);
}
if (tnorm == 0.0) {
fprintf(fp, "vbilut: zero row encountered.\n");
Expand Down Expand Up @@ -231,7 +231,7 @@ int itsol_pc_vbilutC(ITS_VBSparMat *vbmat, ITS_VBILUSpar *lu, int lfil, double t

/* update l-matrix */
lenl = len;
len = min(lenl, lfil);
len = its_min(lenl, lfil);
for (j = 0; j < lenl; j++) {
sz = ITS_B_DIM(bsz, jbuf[j]);
wn[j] = itsol_vbnorm2(dim * sz, w[j]);
Expand All @@ -256,7 +256,7 @@ int itsol_pc_vbilutC(ITS_VBSparMat *vbmat, ITS_VBILUSpar *lu, int lfil, double t
iw[j] = -1;

/* update u-matrix */
len = min(lenu, lfil);
len = its_min(lenu, lfil);
for (j = 1; j < lenu; j++) {
jpos = i + j;
sz = ITS_B_DIM(bsz, jbuf[jpos]);
Expand All @@ -279,7 +279,7 @@ int itsol_pc_vbilutC(ITS_VBSparMat *vbmat, ITS_VBILUSpar *lu, int lfil, double t
sz = ITS_B_DIM(bsz, ja[j]);
ba[j] = (ITS_BData) itsol_malloc(dim * sz * sizeof(double), "vbilut");
itsol_copyBData(dim, sz, ba[j], w[jpos], 0);
t = max(t, wn[j]);
t = its_max(t, wn[j]);
}
for (j = 0; j < lenu - 1; j++)
iw[j] = -1;
Expand Down

0 comments on commit 775e41a

Please sign in to comment.