improve C++ header exceptions, rename NLOPT_FORCE_STOP to NLOPT_FORCED_STOP

[nlopt.git] / mma / mma.c

diff --git a/mma/mma.c b/mma/mma.c
index 638e07d2c48a1debfb3f4e8fd13845bb4726110d..9de104f90dcdf3ce233afe75e4480c99135d1d8c 100644 (file)
--- a/mma/mma.c
+++ b/mma/mma.c
@@ -235,7 +235,7 @@ nlopt_result mma_minimize(unsigned n, nlopt_func f, void *f_data,
 
      while (1) { /* outer iterations */
          double fprev = fcur;
-         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 (feasible && *minf < stop->minf_max) 
@@ -319,7 +319,7 @@ nlopt_result mma_minimize(unsigned n, nlopt_func f, void *f_data,
                    else if (new_infeasible_constraint) feasible = 0;
 
               }
-              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 (feasible && *minf < stop->minf_max)