From a893c0ff92df6d043e55eb3fd6083bb779449385 Mon Sep 17 00:00:00 2001 From: stevenj Date: Mon, 14 Jun 2010 18:51:38 -0400 Subject: [PATCH] add AUGLAG constants to other langs darcs-hash:20100614225138-c8de0-6c10fbcfd0f55f1639c42c3c1bcbe4be66d0c8af.gz --- api/Makefile.am | 4 ++-- octave/Makefile.am | 2 +- octave/NLOPT_AUGLAG.m | 5 +++++ octave/NLOPT_AUGLAG_EQ.m | 5 +++++ octave/NLOPT_GN_ISRES.m | 2 +- octave/NLOPT_LD_AUGLAG.m | 2 +- octave/NLOPT_LD_AUGLAG_EQ.m | 2 +- octave/NLOPT_LN_AUGLAG.m | 2 +- octave/NLOPT_LN_AUGLAG_EQ.m | 2 +- octave/NLOPT_LN_BOBYQA.m | 2 +- octave/mkconstants.sh | 4 ++-- swig/Makefile.am | 2 +- 12 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 octave/NLOPT_AUGLAG.m create mode 100644 octave/NLOPT_AUGLAG_EQ.m diff --git a/api/Makefile.am b/api/Makefile.am index 0cf1a55..7a9f027 100644 --- 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 b2e5cf7..04d48fb 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_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 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 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 9eaaa07..b8ab032 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 = 35; + val = 37; diff --git a/octave/NLOPT_LD_AUGLAG.m b/octave/NLOPT_LD_AUGLAG.m index 704520b..1137452 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 = 31; + val = 33; diff --git a/octave/NLOPT_LD_AUGLAG_EQ.m b/octave/NLOPT_LD_AUGLAG_EQ.m index e327ddb..1d53146 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 = 33; + val = 35; diff --git a/octave/NLOPT_LN_AUGLAG.m b/octave/NLOPT_LN_AUGLAG.m index b204237..deef1c5 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 = 30; + val = 32; diff --git a/octave/NLOPT_LN_AUGLAG_EQ.m b/octave/NLOPT_LN_AUGLAG_EQ.m index 5cc7e00..27cf9f4 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 = 32; + val = 34; diff --git a/octave/NLOPT_LN_BOBYQA.m b/octave/NLOPT_LN_BOBYQA.m index 738946e..3c0cc61 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 = 34; + val = 36; diff --git a/octave/mkconstants.sh b/octave/mkconstants.sh index aeaf19c..45ac91d 100755 --- 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 e6de837..04bde58 100644 --- 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 -- 2.30.2