updated .m files

darcs-hash:20080729062633-c8de0-8bdb86888d51da1a4e2bb26bd4319784a9100b4b.gz

diff --git a/octave/Makefile.am b/octave/Makefile.am
index 18265d184c4b5411aebf59141c0baa1672947e7e..0de0af26ab278e3c68cac4416b10591d80b8ec5e 100644 (file)
--- a/octave/Makefile.am
+++ b/octave/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/api 
 
-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_LN_SUBPLEX.m NLOPT_GD_STOGO.m NLOPT_GD_STOGO_RAND.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 
+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_LN_SUBPLEX.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 
 
 #######################################################################
 octdir = $(OCT_INSTALL_DIR)

diff --git a/octave/NLOPT_GD_MLSL.m b/octave/NLOPT_GD_MLSL.m
index 9cc25eadb637a9c877090b214f2edb5d5579339e..59ec35d2fae2033869b691f6fa9317c754056097 100644 (file)
--- a/octave/NLOPT_GD_MLSL.m
+++ b/octave/NLOPT_GD_MLSL.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_GD_MLSL
-  val = 21;
+  val = 22;

diff --git a/octave/NLOPT_GD_MLSL_LDS.m b/octave/NLOPT_GD_MLSL_LDS.m
index 73c1ef194b3afebb78c697eed1b236f1c5eabc60..ffb623366a8590cfb218994ffb51cac52319ac57 100644 (file)
--- a/octave/NLOPT_GD_MLSL_LDS.m
+++ b/octave/NLOPT_GD_MLSL_LDS.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_GD_MLSL_LDS
-  val = 23;
+  val = 24;

diff --git a/octave/NLOPT_GD_STOGO.m b/octave/NLOPT_GD_STOGO.m
index 67575c09dc17c7fffca553917506cb86761fdb76..e648885dd525c5d2624c99b283c2d2c72f737f3f 100644 (file)
--- a/octave/NLOPT_GD_STOGO.m
+++ b/octave/NLOPT_GD_STOGO.m
@@ -1,4 +1,4 @@
-% NLOPT_GD_STOGO: StoGO (global, derivative-based)
+% NLOPT_GD_STOGO: StoGO (NOT COMPILED)
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_GD_STOGO

diff --git a/octave/NLOPT_GD_STOGO_RAND.m b/octave/NLOPT_GD_STOGO_RAND.m
index decd945794d5b07146e38f88fe6e59e8dc18237e..c9546c997dda771204f07acdf8b5ab7cc9d8c14b 100644 (file)
--- a/octave/NLOPT_GD_STOGO_RAND.m
+++ b/octave/NLOPT_GD_STOGO_RAND.m
@@ -1,4 +1,4 @@
-% NLOPT_GD_STOGO_RAND: StoGO with randomized search (global, derivative-based)
+% NLOPT_GD_STOGO_RAND: StoGO randomized (NOT COMPILED)
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_GD_STOGO_RAND

diff --git a/octave/NLOPT_GN_CRS2_LM.m b/octave/NLOPT_GN_CRS2_LM.m
index bde02d1429b7dca95cac2d9371fef4b8875606ed..54751510df083f34617725f00d2a235a8917059a 100644 (file)
--- a/octave/NLOPT_GN_CRS2_LM.m
+++ b/octave/NLOPT_GN_CRS2_LM.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_GN_CRS2_LM
-  val = 19;
+  val = 20;

diff --git a/octave/NLOPT_GN_MLSL.m b/octave/NLOPT_GN_MLSL.m
index 4642de00eae8e4f9419b4555b70ac169f2aba707..d1fb6b67a552903c104d97a1d91de94e1efb7229 100644 (file)
--- a/octave/NLOPT_GN_MLSL.m
+++ b/octave/NLOPT_GN_MLSL.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_GN_MLSL
-  val = 20;
+  val = 21;

diff --git a/octave/NLOPT_GN_MLSL_LDS.m b/octave/NLOPT_GN_MLSL_LDS.m
index bdde5ba23dc61a9b136008061d08e8085e75bc90..567d2864e50731aa5e6b0b11ab4b1921bc4f8cd5 100644 (file)
--- a/octave/NLOPT_GN_MLSL_LDS.m
+++ b/octave/NLOPT_GN_MLSL_LDS.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_GN_MLSL_LDS
-  val = 22;
+  val = 23;

diff --git a/octave/NLOPT_LD_LBFGS.m b/octave/NLOPT_LD_LBFGS.m
index 47e125fe5ad78399c599cd90f5c01f2d06758c85..7a81af33c1af6648c63c7482350ed351887eb7b8 100644 (file)
--- a/octave/NLOPT_LD_LBFGS.m
+++ b/octave/NLOPT_LD_LBFGS.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_LD_LBFGS
-  val = 11;
+  val = 12;

diff --git a/octave/NLOPT_LD_TNEWTON.m b/octave/NLOPT_LD_TNEWTON.m
index 60fb2d7873ef5721b869a1227bfd1779d747e9be..554b269d788043c3d84175a1c4c0b38847f959fb 100644 (file)
--- a/octave/NLOPT_LD_TNEWTON.m
+++ b/octave/NLOPT_LD_TNEWTON.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_LD_TNEWTON
-  val = 15;
+  val = 16;

diff --git a/octave/NLOPT_LD_TNEWTON_PRECOND.m b/octave/NLOPT_LD_TNEWTON_PRECOND.m
index ab424792d9029eddb8a5bf390de83ec31ab22cf7..1a3ed4d347d73115bf3031fb81a80e67f82f749c 100644 (file)
--- a/octave/NLOPT_LD_TNEWTON_PRECOND.m
+++ b/octave/NLOPT_LD_TNEWTON_PRECOND.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_LD_TNEWTON_PRECOND
-  val = 17;
+  val = 18;

diff --git a/octave/NLOPT_LD_TNEWTON_PRECOND_RESTART.m b/octave/NLOPT_LD_TNEWTON_PRECOND_RESTART.m
index d1e42f75f5dafba849fd972a920f857d88100ef0..b89ac1be98693a95af0a2500b5c27e25f17ed680 100644 (file)
--- a/octave/NLOPT_LD_TNEWTON_PRECOND_RESTART.m
+++ b/octave/NLOPT_LD_TNEWTON_PRECOND_RESTART.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_LD_TNEWTON_PRECOND_RESTART
-  val = 18;
+  val = 19;

diff --git a/octave/NLOPT_LD_TNEWTON_RESTART.m b/octave/NLOPT_LD_TNEWTON_RESTART.m
index 7ef9d755b243476e079098f34216d365ae40f68d..059b140aa6ec9b3fc37296ba3d170735cd4a7a6f 100644 (file)
--- a/octave/NLOPT_LD_TNEWTON_RESTART.m
+++ b/octave/NLOPT_LD_TNEWTON_RESTART.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_LD_TNEWTON_RESTART
-  val = 16;
+  val = 17;

diff --git a/octave/NLOPT_LD_VAR1.m b/octave/NLOPT_LD_VAR1.m
index 0385562c670d3d417ebcd17311f371787a688500..04ffbcbda497b4b823023323aaa940ad1ebd1cfd 100644 (file)
--- a/octave/NLOPT_LD_VAR1.m
+++ b/octave/NLOPT_LD_VAR1.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_LD_VAR1
-  val = 13;
+  val = 14;

diff --git a/octave/NLOPT_LD_VAR2.m b/octave/NLOPT_LD_VAR2.m
index fd9c229196106512f3ba71c1936eeb2e9f5ab92a..f85ad62cdb21d1f0a22ca4822364e0bb3203a05d 100644 (file)
--- a/octave/NLOPT_LD_VAR2.m
+++ b/octave/NLOPT_LD_VAR2.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_LD_VAR2
-  val = 14;
+  val = 15;

diff --git a/octave/NLOPT_LN_PRAXIS.m b/octave/NLOPT_LN_PRAXIS.m
index c768caeddb1b11830e4505ca4e7a1a1549a0198e..ba3cf6a67b6de8d052c55cfc4a5deae280878640 100644 (file)
--- a/octave/NLOPT_LN_PRAXIS.m
+++ b/octave/NLOPT_LN_PRAXIS.m
@@ -2,4 +2,4 @@
 %
 % See nlopt_minimize for more information.
 function val = NLOPT_LN_PRAXIS
-  val = 12;
+  val = 13;

diff --git a/octave/mkconstants.sh b/octave/mkconstants.sh
index 83876b17a9d4a6a4b6210124c68e4f3c8206d7c4..47aef440163ab7d37cf5b6e6ceb717995a253837 100755 (executable)
--- a/octave/mkconstants.sh
+++ b/octave/mkconstants.sh
@@ -3,14 +3,15 @@
 names=`egrep NLOPT_[LG][ND] ../api/nlopt.h |sed 's/ //g' |tr = , |cut -d, -f1`
 i=0
 
-desc_start=`grep -n nlopt_algorithm_names ../api/nlopt.c |cut -d: -f1 |head -1`
+gcc -E ../api/nlopt.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
 #    if test -r $n.m; then
 #      perl -pi -e "s/val = [0-9]+;/val = $i;/" $n.m
 #    else
         descline=`expr $i + $desc_start + 1`
-       desc=`tail -n +$descline ../api/nlopt.c |head -1 |cut -d\" -f2`
+       desc=`tail -n +$descline foo.c |head -1 |cut -d\" -f2`
        cat > $n.m <<EOF
 % $n: $desc
 %