update symbol names

darcs-hash:20070901210625-c8de0-518c86ef7ae04d00c7ce24954db63644aeac024b.gz

diff --git a/cdirect/Makefile.am b/cdirect/Makefile.am
index 32bb1da7dea16927ac32381aaf48accd5ea7a12b..4db8fdd9f7aafaf2a16ad66748d16f775f41f2e9 100644 (file)
--- 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 3528aa303aca344609e92afd4ec4e381e2445b3d..bee74e18c407c3ea3b3187b8c4a5623c9a6e5041 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 45283edf6ac770309e50bf07bdeadf1559f0d523..d3507944c895ccdca0543fe449addb154886d7a6 100644 (file)
--- 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").