improve C++ header exceptions, rename NLOPT_FORCE_STOP to NLOPT_FORCED_STOP

[nlopt.git] / mlsl / mlsl.c

diff --git a/mlsl/mlsl.c b/mlsl/mlsl.c
index 70356a4bfec5cdd6618e23538d464e4d92a9f1c8..b6cca7f7b67a454c924ac439955796bddc76dfec 100644 (file)
--- a/mlsl/mlsl.c
+++ b/mlsl/mlsl.c
@@ -333,7 +333,7 @@ nlopt_result mlsl_minimize(int n, nlopt_func f, void *f_data,
      if (!rb_tree_insert(&d.pts, (rb_key) p)) { 
          free(p); ret = NLOPT_OUT_OF_MEMORY; 
      }
-     if (nlopt_stop_forced(stop)) ret = NLOPT_FORCE_STOP;
+     if (nlopt_stop_forced(stop)) ret = NLOPT_FORCED_STOP;
      else if (nlopt_stop_evals(stop)) ret = NLOPT_MAXEVAL_REACHED;
      else if (nlopt_stop_time(stop)) ret = NLOPT_MAXTIME_REACHED;
      else if (p->f < stop->minf_max) ret = NLOPT_MINF_MAX_REACHED;
@@ -358,7 +358,7 @@ nlopt_result mlsl_minimize(int n, nlopt_func f, void *f_data,
               if (!rb_tree_insert(&d.pts, (rb_key) p)) { 
                    free(p); ret = NLOPT_OUT_OF_MEMORY;
               }
-              if (nlopt_stop_forced(stop)) ret = NLOPT_FORCE_STOP;
+              if (nlopt_stop_forced(stop)) ret = NLOPT_FORCED_STOP;
               else if (nlopt_stop_evals(stop)) ret = NLOPT_MAXEVAL_REACHED;
               else if (nlopt_stop_time(stop)) ret = NLOPT_MAXTIME_REACHED;
               else if (p->f < stop->minf_max) ret = NLOPT_MINF_MAX_REACHED;
@@ -385,7 +385,7 @@ nlopt_result mlsl_minimize(int n, nlopt_func f, void *f_data,
                    double t = nlopt_seconds();
 
                    if (nlopt_stop_forced(stop)) {
-                        ret = NLOPT_FORCE_STOP; break;
+                        ret = NLOPT_FORCED_STOP; break;
                    }
                    if (nlopt_stop_evals(stop)) {
                          ret = NLOPT_MAXEVAL_REACHED; break;
@@ -406,7 +406,7 @@ nlopt_result mlsl_minimize(int n, nlopt_func f, void *f_data,
                    if (!rb_tree_insert(&d.lms, lm)) { 
                         free(lm); ret = NLOPT_OUT_OF_MEMORY;
                    }
-                   else if (nlopt_stop_forced(stop)) ret = NLOPT_FORCE_STOP;
+                   else if (nlopt_stop_forced(stop)) ret = NLOPT_FORCED_STOP;
                    else if (*lm < stop->minf_max) 
                         ret = NLOPT_MINF_MAX_REACHED;
                    else if (nlopt_stop_evals(stop))