add AUGLAG constants to other langs

darcs-hash:20100614225138-c8de0-6c10fbcfd0f55f1639c42c3c1bcbe4be66d0c8af.gz

diff --git a/api/Makefile.am b/api/Makefile.am
index 0cf1a559c9aa398ddc483ff1e77ddebf006aa382..7a9f0274ea5d2db0b92af41a968e76154702ca4f 100644 (file)
--- a/api/Makefile.am
+++ b/api/Makefile.am
@@ -15,10 +15,10 @@ if MAINTAINER_MODE
 
 nlopt.f: nlopt.h
        rm -f $@
-       (i=0; egrep 'NLOPT_[LG][DN]' $(srcdir)/nlopt.h | tr -d ' =0,' | while read n; do echo "      integer $$n"; echo "      parameter ($$n=$$i)"; i=`expr $$i + 1`; done; tail -n +`grep -n enum $(srcdir)/nlopt.h |cut -d: -f1 |tail -n 1` $(srcdir)/nlopt.h  | grep NLOPT | egrep -v 'EXTERN|DEPRECATED|MINF_MAX' | cut -d, -f1 | tr -d ' ' | perl -pe 's/([A-Za-z0-9_]+)=([-+0-9]+)/      integer \1\n      parameter (\1=\2)/') > $@
+       (i=0; egrep 'NLOPT_[LG][DN]|NLOPT_AUGLAG' $(srcdir)/nlopt.h | tr -d ' =0,' | while read n; do echo "      integer $$n"; echo "      parameter ($$n=$$i)"; i=`expr $$i + 1`; done; tail -n +`grep -n enum $(srcdir)/nlopt.h |cut -d: -f1 |tail -n 1` $(srcdir)/nlopt.h  | grep NLOPT | egrep -v 'EXTERN|DEPRECATED|MINF_MAX' | cut -d, -f1 | tr -d ' ' | perl -pe 's/([A-Za-z0-9_]+)=([-+0-9]+)/      integer \1\n      parameter (\1=\2)/') > $@
 
 nlopt.hpp: nlopt.h nlopt-in.hpp
        rm -f $@
-       (n=`grep -n GEN_ENUMS_HERE nlopt-in.hpp | cut -d: -f1`; head -n $$n $(srcdir)/nlopt-in.hpp;  echo "  enum algorithm {"; egrep 'NLOPT_[LG][DN]|NLOPT_NUM_ALGORITHMS' $(srcdir)/nlopt.h | sed 's/NLOPT_//g'; echo "  };"; echo "  enum result {"; egrep 'NLOPT_[A-Z_]* =' $(srcdir)/nlopt.h | egrep -v 'NLOPT_[LG][DN]' | sed 's/NLOPT_//g'; echo "  };"; tail -n +$$n $(srcdir)/nlopt-in.hpp) > $@
+       (n=`grep -n GEN_ENUMS_HERE nlopt-in.hpp | cut -d: -f1`; head -n $$n $(srcdir)/nlopt-in.hpp;  echo "  enum algorithm {"; egrep 'NLOPT_[LG][DN]|NLOPT_AUGLAG|NLOPT_NUM_ALGORITHMS' $(srcdir)/nlopt.h | sed 's/NLOPT_//g'; echo "  };"; echo "  enum result {"; egrep 'NLOPT_[A-Z_]* =' $(srcdir)/nlopt.h | egrep -v 'NLOPT_[LG][DN]' | sed 's/NLOPT_//g'; echo "  };"; tail -n +$$n $(srcdir)/nlopt-in.hpp) > $@
 
 endif

diff --git a/octave/Makefile.am b/octave/Makefile.am
index b2e5cf71b2598a5dffde12c8f0eecd6a86039e1d..04d48fbe342e1f888cf7ebe8431bf6c93dce32d6 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_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 
+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
 
 #######################################################################
 # dummy C program to fool automake into making sure that CPPFLAGS etc.

diff --git a/octave/NLOPT_AUGLAG.m b/octave/NLOPT_AUGLAG.m
new file mode 100644 (file)
index 0000000..3ae1ea3
--- /dev/null
+++ b/octave/NLOPT_AUGLAG.m
@@ -0,0 +1,5 @@
+% NLOPT_AUGLAG: Augmented Lagrangian method (needs sub-algorithm)
+%
+% See nlopt_minimize for more information.
+function val = NLOPT_AUGLAG
+  val = 30;

diff --git a/octave/NLOPT_AUGLAG_EQ.m b/octave/NLOPT_AUGLAG_EQ.m
new file mode 100644 (file)
index 0000000..16e1c12
--- /dev/null
+++ b/octave/NLOPT_AUGLAG_EQ.m
@@ -0,0 +1,5 @@
+% NLOPT_AUGLAG_EQ: Augmented Lagrangian method for equality constraints (needs sub-algorithm)
+%
+% See nlopt_minimize for more information.
+function val = NLOPT_AUGLAG_EQ
+  val = 31;

diff --git a/octave/NLOPT_GN_ISRES.m b/octave/NLOPT_GN_ISRES.m
index 9eaaa07f754d8d43071b21fa3752ab0f390bcb11..b8ab032c6f80ba95e40705e627a18cf3dc420e11 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 = 35;
+  val = 37;

diff --git a/octave/NLOPT_LD_AUGLAG.m b/octave/NLOPT_LD_AUGLAG.m
index 704520b4d53476dbe63fee5d936f9e0f1c26c967..11374521b8ca94869f5b015fb6510019b794af5b 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 = 31;
+  val = 33;

diff --git a/octave/NLOPT_LD_AUGLAG_EQ.m b/octave/NLOPT_LD_AUGLAG_EQ.m
index e327ddb93fb4017bb85411e27aa674ec3401b25c..1d5314618498d05aae35f5caa1a28180929e2f4f 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 = 33;
+  val = 35;

diff --git a/octave/NLOPT_LN_AUGLAG.m b/octave/NLOPT_LN_AUGLAG.m
index b204237f0d5333f62a352bcca6a2eb4a4daf244a..deef1c53dacddc8ec3c94ed0bb5dcdb1389b1379 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 = 30;
+  val = 32;

diff --git a/octave/NLOPT_LN_AUGLAG_EQ.m b/octave/NLOPT_LN_AUGLAG_EQ.m
index 5cc7e007b8c995a506467979f7dbed5eb5e9bb93..27cf9f4948ac0a40884881c615874e103d086451 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 = 32;
+  val = 34;

diff --git a/octave/NLOPT_LN_BOBYQA.m b/octave/NLOPT_LN_BOBYQA.m
index 738946ee3de670cc79eddcfa2c79104019e64c05..3c0cc6114561b34269b2bbb4f284cbb216d3759e 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 = 34;
+  val = 36;

diff --git a/octave/mkconstants.sh b/octave/mkconstants.sh
index aeaf19ca758a0a2a2170ca4e5bb70c40db5a4adb..45ac91da0e8843d6f1522bd3da858d8474e45fa2 100755 (executable)
--- a/octave/mkconstants.sh
+++ b/octave/mkconstants.sh
@@ -1,9 +1,9 @@
 #!/bin/sh 
 
-names=`egrep NLOPT_[LG][ND] ../api/nlopt.h |sed 's/ //g' |tr = , |cut -d, -f1`
+names=`egrep 'NLOPT_[LG][ND]|NLOPT_AUGLAG' ../api/nlopt.h |sed 's/ //g' |tr = , |cut -d, -f1`
 i=0
 
-gcc -I.. -E ../api/nlopt.c | perl -pe 's/^ *\n//' > foo.c
+gcc -I../util -I.. -E ../api/general.c | perl -pe 's/^ *\n//' > foo.c
 desc_start=`grep -n nlopt_algorithm_names foo.c |cut -d: -f1 |head -1`
 
 for n in $names; do

diff --git a/swig/Makefile.am b/swig/Makefile.am
index e6de837e53b887ae70abd4f0c0a237cd75bcdad8..04bde58729ba5a25ca59326eb3ee44748b054b92 100644 (file)
--- a/swig/Makefile.am
+++ b/swig/Makefile.am
@@ -51,6 +51,6 @@ nlopt-python.cpp nlopt.py: $(SWIG_SRC) nlopt-python.i numpy.i $(HDR)
        swig -I$(top_builddir)/api -outdir $(builddir) -c++ -python -o $@ nlopt.i
 
 nlopt-enum-renames.i: $(top_srcdir)/api/nlopt.h
-       (echo "// AUTOMATICALLY GENERATED -- DO NOT EDIT"; egrep 'NLOPT_[LG][DN]|NLOPT_NUM_ALGORITHMS' $(top_srcdir)/api/nlopt.h | sed 's/NLOPT_//g' |tr -d ' ' |tr '/' ',' |tr '=' ',' |cut -d, -f1 |while read name; do echo "%rename(NLOPT_$$name) nlopt::$$name;"; done; egrep 'NLOPT_[A-Z_]* =' $(top_srcdir)/api/nlopt.h | egrep -v 'NLOPT_[LG][DN]' | sed 's/NLOPT_//g' |tr -d ' ' |cut -d'=' -f1 | while read name; do echo "%rename(NLOPT_$$name) nlopt::$$name;"; done) > $@
+       (echo "// AUTOMATICALLY GENERATED -- DO NOT EDIT"; egrep 'NLOPT_[LG][DN]|NLOPT_AUGLAG|NLOPT_NUM_ALGORITHMS' $(top_srcdir)/api/nlopt.h | sed 's/NLOPT_//g' |tr -d ' ' |tr '/' ',' |tr '=' ',' |cut -d, -f1 |while read name; do echo "%rename(NLOPT_$$name) nlopt::$$name;"; done; egrep 'NLOPT_[A-Z_]* =' $(top_srcdir)/api/nlopt.h | egrep -v 'NLOPT_[LG][DN]|NLOPT_AUGLAG' | sed 's/NLOPT_//g' |tr -d ' ' |cut -d'=' -f1 | while read name; do echo "%rename(NLOPT_$$name) nlopt::$$name;"; done) > $@
 
 endif