Use trusty

[nlopt.git] / direct / DIRparallel.c

diff --git a/direct/DIRparallel.c b/direct/DIRparallel.c
index aba092efe8e18b9ddd93f22262cd859e6bc90ea4..88fb90240295d4856adbb00724e9dfd5d261444f 100644 (file)
--- a/direct/DIRparallel.c
+++ b/direct/DIRparallel.c
@@ -26,7 +26,7 @@ static integer c_n1 = -1;
 /* | termination signal.                                                   | */
 /* +-----------------------------------------------------------------------+ */
 /* Subroutine */ int direct_pardirect_(fp fcn, doublereal *x, integer *n, 
-       doublereal *eps, integer *maxf, integer *maxt, doublereal *fmin, 
+       doublereal *eps, integer *maxf, integer *maxt, doublereal *minf, 
        doublereal *l, doublereal *u, integer *algmethod, integer *ierror, 
        FILE *logfile, doublereal *fglobal, doublereal *fglper, doublereal 
        *volper, doublereal *sigmaper, void *fcn_data)
@@ -101,7 +101,7 @@ static integer c_n1 = -1;
 /* | Call Direct main routine. This routine calls DIRSamplef for the       | */
 /* | function evaluations, which are then done in parallel.                | */
 /* +-----------------------------------------------------------------------+ */
-       direct_direct_(fcn, &x[1], n, eps, maxf, maxt, fmin, &l[1], &u[1], 
+       direct_direct_(fcn, &x[1], n, eps, maxf, maxt, minf, &l[1], &u[1], 
                algmethod, ierror, logfile, fglobal, fglper, volper, sigmaper,
                fcn_data);
 /* +-----------------------------------------------------------------------+ */
@@ -151,7 +151,7 @@ static integer c_n1 = -1;
        *delta, integer *sample, integer *new__, integer *length, 
        FILE *logfile, doublereal *f, integer *free, integer *maxi, 
        integer *point, fp fcn, doublereal *x, doublereal *l, doublereal *
-       fmin, integer *minpos, doublereal *u, integer *n, integer *maxfunc, 
+       minf, integer *minpos, doublereal *u, integer *n, integer *maxfunc, 
        integer *maxdeep, integer *oops, doublereal *fmax, integer *
        ifeasiblef, integer *iinfesiblef, void *fcn_data)
 {
@@ -371,8 +371,8 @@ static integer c_n1 = -1;
 /* +-----------------------------------------------------------------------+ */
     i__1 = *maxi + *maxi;
     for (j = 1; j <= i__1; ++j) {
-       if (f[pos + f_dim1] < *fmin && f[pos + (f_dim1 << 1)] == 0.) {
-           *fmin = f[pos + f_dim1];
+       if (f[pos + f_dim1] < *minf && f[pos + (f_dim1 << 1)] == 0.) {
+           *minf = f[pos + f_dim1];
            *minpos = pos;
        }
        pos = point[pos];