Use trusty

[nlopt.git] / direct / DIRect.c

diff --git a/direct/DIRect.c b/direct/DIRect.c
index 1bd4bbfa204acf254dcb6229b82a874a7a605898..f0a7c1a95cd7f6bd311d3f26a1a80f0e21d729d3 100644 (file)
--- a/direct/DIRect.c
+++ b/direct/DIRect.c
@@ -44,7 +44,7 @@
 /* |   Lipschitz continues. However, DIRECT has proven to be effective on  | */
 /* |   more complex problems than these.                                   | */
 /* +-----------------------------------------------------------------------+ */
-/* Subroutine */ void direct_direct_(fp fcn, doublereal *x, integer *n, doublereal *eps, doublereal epsabs, integer *maxf, integer *maxt, int *force_stop, doublereal *minf, doublereal *l, 
+/* Subroutine */ void direct_direct_(fp fcn, doublereal *x, integer *n, doublereal *eps, doublereal epsabs, integer *maxf, integer *maxt, double starttime, double maxtime, int *force_stop, doublereal *minf, doublereal *l, 
        doublereal *u, integer *algmethod, integer *ierror, FILE *logfile, 
        doublereal *fglobal, doublereal *fglper, doublereal *volper, 
        doublereal *sigmaper, void *fcn_data)
@@ -406,7 +406,7 @@
            logfile, arrayi, &maxi, list2, w, &x[1], &l[1], &u[1], 
            minf, &minpos, thirds, levels, &MAXFUNC, &MAXDEEP, n, n, &
            fmax, &ifeasiblef, &iinfesiblef, ierror, fcn_data, jones,
-            force_stop);
+                   starttime, maxtime, force_stop);
 /* +-----------------------------------------------------------------------+ */
 /* | Added error checking.                                                 | */
 /* +-----------------------------------------------------------------------+ */
@@ -423,6 +423,7 @@
        }
        if (*ierror == -102) goto L100;
     }
+    else if (*ierror == DIRECT_MAXTIME_EXCEEDED) goto L100;
     numfunc = maxi + 1 + maxi;
     actmaxdeep = 1;
     oldpos = 0;
@@ -551,6 +552,10 @@
                     *ierror = -102;
                     goto L100;
                }
+               if (nlopt_stop_time_(starttime, maxtime)) {
+                    *ierror = DIRECT_MAXTIME_EXCEEDED;
+                    goto L100;
+               }
                if (oops > 0) {
                    if (logfile)
                         fprintf(logfile, "WARNING: Error occured in routine DIRsamplef.\n");