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 02d370dc50a98d655976e44975c3082b38bc74fa..b217a8959c8574b41ebdda0468c36b7377e798ef 100644 (file)
--- 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 bc1dde3965670359df7f36871a66c2fcb7399604..bfa8e41290c8d2cd25317b6b7e7d15839123a6ee 100644 (file)
--- 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 04d48fbe342e1f888cf7ebe8431bf6c93dce32d6..36840774bc840a7f4cf58d9301b0881cf1a57894 100644 (file)
--- 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 3ae1ea3bc3cacf47b0e037f0679d8a243c8bfa73..cd51cb1df13902070e5cfe245b96c060e37cfa30 100644 (file)
--- 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 16e1c1232ef0d4867a6684487c2ec8a1f5548583..2177c65e1605fe2f2d478ae1e89f8d648a6c73c5 100644 (file)
--- 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 b8ab032c6f80ba95e40705e627a18cf3dc420e11..9eaaa07f754d8d43071b21fa3752ab0f390bcb11 100644 (file)
--- 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 11374521b8ca94869f5b015fb6510019b794af5b..704520b4d53476dbe63fee5d936f9e0f1c26c967 100644 (file)
--- 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 1d5314618498d05aae35f5caa1a28180929e2f4f..e327ddb93fb4017bb85411e27aa674ec3401b25c 100644 (file)
--- 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 deef1c53dacddc8ec3c94ed0bb5dcdb1389b1379..b204237f0d5333f62a352bcca6a2eb4a4daf244a 100644 (file)
--- 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 27cf9f4948ac0a40884881c615874e103d086451..5cc7e007b8c995a506467979f7dbed5eb5e9bb93 100644 (file)
--- 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 3c0cc6114561b34269b2bbb4f284cbb216d3759e..738946ee3de670cc79eddcfa2c79104019e64c05 100644 (file)
--- 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;