From 52c4c7c8cf07adbea3bd51fd46f11f73dbd50108 Mon Sep 17 00:00:00 2001 From: stevenj Date: Sat, 1 Sep 2007 17:06:25 -0400 Subject: [PATCH] update symbol names darcs-hash:20070901210625-c8de0-518c86ef7ae04d00c7ce24954db63644aeac024b.gz --- cdirect/Makefile.am | 2 +- octave/Makefile.am | 10 +++++----- octave/NLOPT_GD_STOGO.m | 2 ++ octave/NLOPT_GD_STOGO_RAND.m | 2 ++ octave/NLOPT_GLOBAL_DIRECT.m | 2 -- octave/NLOPT_GLOBAL_DIRECT_L.m | 2 -- octave/NLOPT_GLOBAL_DIRECT_L_RANDOMIZED.m | 2 -- octave/NLOPT_GLOBAL_ORIG_DIRECT.m | 2 -- octave/NLOPT_GLOBAL_ORIG_DIRECT_L.m | 2 -- octave/NLOPT_GLOBAL_STOGO.m | 2 -- octave/NLOPT_GLOBAL_STOGO_RANDOMIZED.m | 2 -- octave/NLOPT_GN_DIRECT.m | 2 ++ octave/NLOPT_GN_DIRECT_L.m | 2 ++ octave/NLOPT_GN_DIRECT_L_RAND.m | 2 ++ octave/NLOPT_GN_ORIG_DIRECT.m | 2 ++ octave/NLOPT_GN_ORIG_DIRECT_L.m | 2 ++ octave/NLOPT_LD_LBFGS.m | 2 ++ octave/NLOPT_LN_SUBPLEX.m | 2 ++ octave/NLOPT_LOCAL_LBFGS.m | 2 -- octave/NLOPT_LOCAL_SUBPLEX.m | 2 -- octave/nlopt_minimize.m | 12 ++++++------ 21 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 octave/NLOPT_GD_STOGO.m create mode 100644 octave/NLOPT_GD_STOGO_RAND.m delete mode 100644 octave/NLOPT_GLOBAL_DIRECT.m delete mode 100644 octave/NLOPT_GLOBAL_DIRECT_L.m delete mode 100644 octave/NLOPT_GLOBAL_DIRECT_L_RANDOMIZED.m delete mode 100644 octave/NLOPT_GLOBAL_ORIG_DIRECT.m delete mode 100644 octave/NLOPT_GLOBAL_ORIG_DIRECT_L.m delete mode 100644 octave/NLOPT_GLOBAL_STOGO.m delete mode 100644 octave/NLOPT_GLOBAL_STOGO_RANDOMIZED.m create mode 100644 octave/NLOPT_GN_DIRECT.m create mode 100644 octave/NLOPT_GN_DIRECT_L.m create mode 100644 octave/NLOPT_GN_DIRECT_L_RAND.m create mode 100644 octave/NLOPT_GN_ORIG_DIRECT.m create mode 100644 octave/NLOPT_GN_ORIG_DIRECT_L.m create mode 100644 octave/NLOPT_LD_LBFGS.m create mode 100644 octave/NLOPT_LN_SUBPLEX.m delete mode 100644 octave/NLOPT_LOCAL_LBFGS.m delete mode 100644 octave/NLOPT_LOCAL_SUBPLEX.m diff --git a/cdirect/Makefile.am b/cdirect/Makefile.am index 32bb1da..4db8fdd 100644 --- a/cdirect/Makefile.am +++ b/cdirect/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_srcdir)/api noinst_LTLIBRARIES = libcdirect.la -libcdirect_la_SOURCES = cdirect.c cdirect.h redblack.c redblack.h +libcdirect_la_SOURCES = cdirect.c hybrid.c cdirect.h redblack.c redblack.h noinst_PROGRAMS = redblack_test redblack_test_SOURCES = redblack_test.c diff --git a/octave/Makefile.am b/octave/Makefile.am index 3528aa3..bee74e1 100644 --- a/octave/Makefile.am +++ b/octave/Makefile.am @@ -1,10 +1,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/api -MFILES = NLOPT_GLOBAL_DIRECT_L.m NLOPT_GLOBAL_DIRECT_L_RANDOMIZED.m \ -NLOPT_GLOBAL_DIRECT.m NLOPT_GLOBAL_ORIG_DIRECT_L.m \ -NLOPT_GLOBAL_ORIG_DIRECT.m NLOPT_GLOBAL_STOGO.m \ -NLOPT_GLOBAL_STOGO_RANDOMIZED.m NLOPT_LOCAL_LBFGS.m \ -NLOPT_LOCAL_SUBPLEX.m nlopt_minimize.m +MFILES = NLOPT_GN_DIRECT_L.m NLOPT_GN_DIRECT_L_RAND.m \ +NLOPT_GN_DIRECT.m NLOPT_GN_ORIG_DIRECT_L.m \ +NLOPT_GN_ORIG_DIRECT.m NLOPT_GD_STOGO.m \ +NLOPT_GD_STOGO_RAND.m NLOPT_LD_LBFGS.m \ +NLOPT_LN_SUBPLEX.m nlopt_minimize.m octdir = $(OCT_INSTALL_DIR) mdir = $(M_INSTALL_DIR) diff --git a/octave/NLOPT_GD_STOGO.m b/octave/NLOPT_GD_STOGO.m new file mode 100644 index 0000000..405226d --- /dev/null +++ b/octave/NLOPT_GD_STOGO.m @@ -0,0 +1,2 @@ +function a = NLOPT_GD_STOGO + a = 9; diff --git a/octave/NLOPT_GD_STOGO_RAND.m b/octave/NLOPT_GD_STOGO_RAND.m new file mode 100644 index 0000000..39a6106 --- /dev/null +++ b/octave/NLOPT_GD_STOGO_RAND.m @@ -0,0 +1,2 @@ +function a = NLOPT_GD_STOGO_RAND + a = 10; diff --git a/octave/NLOPT_GLOBAL_DIRECT.m b/octave/NLOPT_GLOBAL_DIRECT.m deleted file mode 100644 index c0623d3..0000000 --- a/octave/NLOPT_GLOBAL_DIRECT.m +++ /dev/null @@ -1,2 +0,0 @@ -function a = NLOPT_GLOBAL_DIRECT - a = 0; diff --git a/octave/NLOPT_GLOBAL_DIRECT_L.m b/octave/NLOPT_GLOBAL_DIRECT_L.m deleted file mode 100644 index ab749d2..0000000 --- a/octave/NLOPT_GLOBAL_DIRECT_L.m +++ /dev/null @@ -1,2 +0,0 @@ -function a = NLOPT_GLOBAL_DIRECT_L - a = 1; diff --git a/octave/NLOPT_GLOBAL_DIRECT_L_RANDOMIZED.m b/octave/NLOPT_GLOBAL_DIRECT_L_RANDOMIZED.m deleted file mode 100644 index 6dc8d38..0000000 --- a/octave/NLOPT_GLOBAL_DIRECT_L_RANDOMIZED.m +++ /dev/null @@ -1,2 +0,0 @@ -function a = NLOPT_GLOBAL_DIRECT_L_RANDOMIZED - a = 2; diff --git a/octave/NLOPT_GLOBAL_ORIG_DIRECT.m b/octave/NLOPT_GLOBAL_ORIG_DIRECT.m deleted file mode 100644 index 9b749a5..0000000 --- a/octave/NLOPT_GLOBAL_ORIG_DIRECT.m +++ /dev/null @@ -1,2 +0,0 @@ -function a = NLOPT_GLOBAL_ORIG_DIRECT - a = 3; diff --git a/octave/NLOPT_GLOBAL_ORIG_DIRECT_L.m b/octave/NLOPT_GLOBAL_ORIG_DIRECT_L.m deleted file mode 100644 index f133cf3..0000000 --- a/octave/NLOPT_GLOBAL_ORIG_DIRECT_L.m +++ /dev/null @@ -1,2 +0,0 @@ -function a = NLOPT_GLOBAL_ORIG_DIRECT_L - a = 4; diff --git a/octave/NLOPT_GLOBAL_STOGO.m b/octave/NLOPT_GLOBAL_STOGO.m deleted file mode 100644 index 3929ff0..0000000 --- a/octave/NLOPT_GLOBAL_STOGO.m +++ /dev/null @@ -1,2 +0,0 @@ -function a = NLOPT_GLOBAL_STOGO - a = 6; diff --git a/octave/NLOPT_GLOBAL_STOGO_RANDOMIZED.m b/octave/NLOPT_GLOBAL_STOGO_RANDOMIZED.m deleted file mode 100644 index 06e6be6..0000000 --- a/octave/NLOPT_GLOBAL_STOGO_RANDOMIZED.m +++ /dev/null @@ -1,2 +0,0 @@ -function a = NLOPT_GLOBAL_STOGO_RANDOMIZED - a = 7; diff --git a/octave/NLOPT_GN_DIRECT.m b/octave/NLOPT_GN_DIRECT.m new file mode 100644 index 0000000..cfe4e9a --- /dev/null +++ b/octave/NLOPT_GN_DIRECT.m @@ -0,0 +1,2 @@ +function a = NLOPT_GN_DIRECT + a = 0; diff --git a/octave/NLOPT_GN_DIRECT_L.m b/octave/NLOPT_GN_DIRECT_L.m new file mode 100644 index 0000000..fe725d7 --- /dev/null +++ b/octave/NLOPT_GN_DIRECT_L.m @@ -0,0 +1,2 @@ +function a = NLOPT_GN_DIRECT_L + a = 1; diff --git a/octave/NLOPT_GN_DIRECT_L_RAND.m b/octave/NLOPT_GN_DIRECT_L_RAND.m new file mode 100644 index 0000000..fef4a5a --- /dev/null +++ b/octave/NLOPT_GN_DIRECT_L_RAND.m @@ -0,0 +1,2 @@ +function a = NLOPT_GN_DIRECT_L_RAND + a = 2; diff --git a/octave/NLOPT_GN_ORIG_DIRECT.m b/octave/NLOPT_GN_ORIG_DIRECT.m new file mode 100644 index 0000000..9ffab0d --- /dev/null +++ b/octave/NLOPT_GN_ORIG_DIRECT.m @@ -0,0 +1,2 @@ +function a = NLOPT_GN_ORIG_DIRECT + a = 6; diff --git a/octave/NLOPT_GN_ORIG_DIRECT_L.m b/octave/NLOPT_GN_ORIG_DIRECT_L.m new file mode 100644 index 0000000..52e182e --- /dev/null +++ b/octave/NLOPT_GN_ORIG_DIRECT_L.m @@ -0,0 +1,2 @@ +function a = NLOPT_GN_ORIG_DIRECT_L + a = 7; diff --git a/octave/NLOPT_LD_LBFGS.m b/octave/NLOPT_LD_LBFGS.m new file mode 100644 index 0000000..992daa5 --- /dev/null +++ b/octave/NLOPT_LD_LBFGS.m @@ -0,0 +1,2 @@ +function a = NLOPT_LD_LBFGS + a = 11; diff --git a/octave/NLOPT_LN_SUBPLEX.m b/octave/NLOPT_LN_SUBPLEX.m new file mode 100644 index 0000000..4fb3579 --- /dev/null +++ b/octave/NLOPT_LN_SUBPLEX.m @@ -0,0 +1,2 @@ +function a = NLOPT_LN_SUBPLEX + a = 8; diff --git a/octave/NLOPT_LOCAL_LBFGS.m b/octave/NLOPT_LOCAL_LBFGS.m deleted file mode 100644 index c50e72f..0000000 --- a/octave/NLOPT_LOCAL_LBFGS.m +++ /dev/null @@ -1,2 +0,0 @@ -function a = NLOPT_LOCAL_LBFGS - a = 8; diff --git a/octave/NLOPT_LOCAL_SUBPLEX.m b/octave/NLOPT_LOCAL_SUBPLEX.m deleted file mode 100644 index 95c2fbc..0000000 --- a/octave/NLOPT_LOCAL_SUBPLEX.m +++ /dev/null @@ -1,2 +0,0 @@ -function a = NLOPT_LOCAL_SUBPLEX - a = 5; diff --git a/octave/nlopt_minimize.m b/octave/nlopt_minimize.m index 45283ed..d350794 100644 --- a/octave/nlopt_minimize.m +++ b/octave/nlopt_minimize.m @@ -49,13 +49,13 @@ % interpretation are the same as for the C function): % % Derivative-free algorithms: -% NLOPT_GLOBAL_DIRECT, NLOPT_GLOBAL_DIRECT_L, -% NLOPT_GLOBAL_DIRECT_L_RANDOMIZED, -% NLOPT_GLOBAL_ORIG_DIRECT, NLOPT_GLOBAL_ORIG_DIRECT_L, -% NLOPT_LOCAL_SUBPLEX +% NLOPT_GN_DIRECT, NLOPT_GN_DIRECT_L, +% NLOPT_GN_DIRECT_L_RAND, +% NLOPT_GN_ORIG_DIRECT, NLOPT_GN_ORIG_DIRECT_L, +% NLOPT_LN_SUBPLEX % % Gradient-based algorithms: -% NLOPT_GLOBAL_STOGO, NLOPT_GLOBAL_STOGO_RANDOMIZED, NLOPT_LOCAL_LBFGS +% NLOPT_GD_STOGO, NLOPT_GD_STOGO_RAND, NLOPT_LD_LBFGS % % For more information on individual functions, see their individual -% help pages (e.g. "help NLOPT_LOCAL_SUBPLEX"). +% help pages (e.g. "help NLOPT_LN_SUBPLEX"). -- 2.30.2