use nlopt_stopping in StoGO (currently only for maxevals and maxtime)

[nlopt.git] / stogo / global.h

diff --git a/stogo/global.h b/stogo/global.h
index e9d8814c035e79fd901363b1bde03b5b16cd5555..36c2b0e15c1713d64e0f661c7638f099d9b45394 100644 (file)
--- a/stogo/global.h
+++ b/stogo/global.h
@@ -1,6 +1,8 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
+#include "nlopt-util.h"
+
 #include <queue>
 //#include "function.h"
 #include "tools.h"
@@ -24,8 +26,12 @@ typedef objgrad* Pobjgrad ;
 
 class GlobalParams {
 public:
+#ifdef NLOPT_UTIL_H
+  nlopt_stopping *stop;
+#else
   double maxtime;
   long int maxeval;
+#endif
   double eps_cl, mu, rshift;
   int det_pnts, rnd_pnts;
 };