From: stevenj <stevenj@alum.mit.edu>
Date: Mon, 14 Jun 2010 22:53:07 +0000 (-0400)
Subject: move new AUGLAG constants to end of list in order to preserve backwards compatibility
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9d105f618f9f777b2e0c773885ce1b60679682e3;p=nlopt.git

move new AUGLAG constants to end of list in order to preserve backwards compatibility

darcs-hash:20100614225307-c8de0-92350fe85ba959cce1d7d25007eb6ce768a20603.gz
---

diff --git a/api/general.c b/api/general.c
index 02d370d..b217a89 100644
--- a/api/general.c
+++ b/api/general.c
@@ -85,14 +85,14 @@ static const char nlopt_algorithm_names[NLOPT_NUM_ALGORITHMS][256] = {
      "Bound-constrained optimization via NEWUOA-based quadratic models (local, no-derivative)",
      "Nelder-Mead simplex algorithm (local, no-derivative)",
      "Sbplx variant of Nelder-Mead (re-implementation of Rowan's Subplex) (local, no-derivative)",
-     "Augmented Lagrangian method (needs sub-algorithm)",
-     "Augmented Lagrangian method for equality constraints (needs sub-algorithm)",
      "Augmented Lagrangian method (local, no-derivative)",
      "Augmented Lagrangian method (local, derivative)",
      "Augmented Lagrangian method for equality constraints (local, no-derivative)",
      "Augmented Lagrangian method for equality constraints (local, derivative)",
      "BOBYQA bound-constrained optimization via quadratic models (local, no-derivative)",
      "ISRES evolutionary constrained optimization (global, no-derivative)",
+     "Augmented Lagrangian method (needs sub-algorithm)",
+     "Augmented Lagrangian method for equality constraints (needs sub-algorithm)",
 };
 
 const char *nlopt_algorithm_name(nlopt_algorithm a)
diff --git a/api/nlopt.h b/api/nlopt.h
index bc1dde3..bfa8e41 100644
--- a/api/nlopt.h
+++ b/api/nlopt.h
@@ -116,8 +116,6 @@ typedef enum {
      NLOPT_LN_NELDERMEAD,
      NLOPT_LN_SBPLX,
 
-     NLOPT_AUGLAG,
-     NLOPT_AUGLAG_EQ,
      NLOPT_LN_AUGLAG,
      NLOPT_LD_AUGLAG,
      NLOPT_LN_AUGLAG_EQ,
@@ -127,6 +125,10 @@ typedef enum {
 
      NLOPT_GN_ISRES,
 
+     /* not with older AUGLAG constants for backwards compatibility */
+     NLOPT_AUGLAG,
+     NLOPT_AUGLAG_EQ,
+
      NLOPT_NUM_ALGORITHMS /* not an algorithm, just the number of them */
 } nlopt_algorithm;
 
diff --git a/octave/Makefile.am b/octave/Makefile.am
index 04d48fb..3684077 100644
--- a/octave/Makefile.am
+++ b/octave/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/api -I$(top_srcdir)/util
 
-MFILES = NLOPT_AUGLAG_EQ.m NLOPT_AUGLAG.m NLOPT_GD_MLSL_LDS.m NLOPT_GD_MLSL.m NLOPT_GD_STOGO.m NLOPT_GD_STOGO_RAND.m NLOPT_GN_CRS2_LM.m NLOPT_GN_DIRECT_L.m NLOPT_GN_DIRECT_L_NOSCAL.m NLOPT_GN_DIRECT_L_RAND.m NLOPT_GN_DIRECT_L_RAND_NOSCAL.m NLOPT_GN_DIRECT.m NLOPT_GN_DIRECT_NOSCAL.m NLOPT_GN_ISRES.m NLOPT_GN_MLSL_LDS.m NLOPT_GN_MLSL.m NLOPT_GN_ORIG_DIRECT_L.m NLOPT_GN_ORIG_DIRECT.m NLOPT_LD_AUGLAG_EQ.m NLOPT_LD_AUGLAG.m NLOPT_LD_LBFGS.m NLOPT_LD_LBFGS_NOCEDAL.m NLOPT_LD_MMA.m NLOPT_LD_TNEWTON.m NLOPT_LD_TNEWTON_PRECOND.m NLOPT_LD_TNEWTON_PRECOND_RESTART.m NLOPT_LD_TNEWTON_RESTART.m NLOPT_LD_VAR1.m NLOPT_LD_VAR2.m NLOPT_LN_AUGLAG_EQ.m NLOPT_LN_AUGLAG.m NLOPT_LN_BOBYQA.m NLOPT_LN_COBYLA.m NLOPT_LN_NELDERMEAD.m NLOPT_LN_NEWUOA_BOUND.m NLOPT_LN_NEWUOA.m NLOPT_LN_PRAXIS.m NLOPT_LN_SBPLX.m
+MFILES = NLOPT_GN_DIRECT.m NLOPT_GN_DIRECT_L.m NLOPT_GN_DIRECT_L_RAND.m NLOPT_GN_DIRECT_NOSCAL.m NLOPT_GN_DIRECT_L_NOSCAL.m NLOPT_GN_DIRECT_L_RAND_NOSCAL.m NLOPT_GN_ORIG_DIRECT.m NLOPT_GN_ORIG_DIRECT_L.m NLOPT_GD_STOGO.m NLOPT_GD_STOGO_RAND.m NLOPT_LD_LBFGS_NOCEDAL.m NLOPT_LD_LBFGS.m NLOPT_LN_PRAXIS.m NLOPT_LD_VAR1.m NLOPT_LD_VAR2.m NLOPT_LD_TNEWTON.m NLOPT_LD_TNEWTON_RESTART.m NLOPT_LD_TNEWTON_PRECOND.m NLOPT_LD_TNEWTON_PRECOND_RESTART.m NLOPT_GN_CRS2_LM.m NLOPT_GN_MLSL.m NLOPT_GD_MLSL.m NLOPT_GN_MLSL_LDS.m NLOPT_GD_MLSL_LDS.m NLOPT_LD_MMA.m NLOPT_LN_COBYLA.m NLOPT_LN_NEWUOA.m NLOPT_LN_NEWUOA_BOUND.m NLOPT_LN_NELDERMEAD.m NLOPT_LN_SBPLX.m NLOPT_LN_AUGLAG.m NLOPT_LD_AUGLAG.m NLOPT_LN_AUGLAG_EQ.m NLOPT_LD_AUGLAG_EQ.m NLOPT_LN_BOBYQA.m NLOPT_GN_ISRES.m NLOPT_AUGLAG.m NLOPT_AUGLAG_EQ.m 
 
 #######################################################################
 # dummy C program to fool automake into making sure that CPPFLAGS etc.
diff --git a/octave/NLOPT_AUGLAG.m b/octave/NLOPT_AUGLAG.m
index 3ae1ea3..cd51cb1 100644
--- a/octave/NLOPT_AUGLAG.m
+++ b/octave/NLOPT_AUGLAG.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_AUGLAG
-  val = 30;
+  val = 36;
diff --git a/octave/NLOPT_AUGLAG_EQ.m b/octave/NLOPT_AUGLAG_EQ.m
index 16e1c12..2177c65 100644
--- a/octave/NLOPT_AUGLAG_EQ.m
+++ b/octave/NLOPT_AUGLAG_EQ.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_AUGLAG_EQ
-  val = 31;
+  val = 37;
diff --git a/octave/NLOPT_GN_ISRES.m b/octave/NLOPT_GN_ISRES.m
index b8ab032..9eaaa07 100644
--- a/octave/NLOPT_GN_ISRES.m
+++ b/octave/NLOPT_GN_ISRES.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_GN_ISRES
-  val = 37;
+  val = 35;
diff --git a/octave/NLOPT_LD_AUGLAG.m b/octave/NLOPT_LD_AUGLAG.m
index 1137452..704520b 100644
--- a/octave/NLOPT_LD_AUGLAG.m
+++ b/octave/NLOPT_LD_AUGLAG.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_LD_AUGLAG
-  val = 33;
+  val = 31;
diff --git a/octave/NLOPT_LD_AUGLAG_EQ.m b/octave/NLOPT_LD_AUGLAG_EQ.m
index 1d53146..e327ddb 100644
--- a/octave/NLOPT_LD_AUGLAG_EQ.m
+++ b/octave/NLOPT_LD_AUGLAG_EQ.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_LD_AUGLAG_EQ
-  val = 35;
+  val = 33;
diff --git a/octave/NLOPT_LN_AUGLAG.m b/octave/NLOPT_LN_AUGLAG.m
index deef1c5..b204237 100644
--- a/octave/NLOPT_LN_AUGLAG.m
+++ b/octave/NLOPT_LN_AUGLAG.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_LN_AUGLAG
-  val = 32;
+  val = 30;
diff --git a/octave/NLOPT_LN_AUGLAG_EQ.m b/octave/NLOPT_LN_AUGLAG_EQ.m
index 27cf9f4..5cc7e00 100644
--- a/octave/NLOPT_LN_AUGLAG_EQ.m
+++ b/octave/NLOPT_LN_AUGLAG_EQ.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_LN_AUGLAG_EQ
-  val = 34;
+  val = 32;
diff --git a/octave/NLOPT_LN_BOBYQA.m b/octave/NLOPT_LN_BOBYQA.m
index 3c0cc61..738946e 100644
--- a/octave/NLOPT_LN_BOBYQA.m
+++ b/octave/NLOPT_LN_BOBYQA.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_LN_BOBYQA
-  val = 36;
+  val = 34;