From f4e74eb164d4ef650a339ef3eb4b34df177ee6e5 Mon Sep 17 00:00:00 2001 From: Julien Schueller Date: Sun, 10 Nov 2024 11:59:10 +0100 Subject: [PATCH] Drop LD_LBFGS_NOCEDAL --- NEWS.md | 2 ++ src/api/general.c | 2 -- src/api/nlopt.h | 2 -- src/octave/CMakeLists.txt | 2 +- src/octave/NLOPT_AUGLAG.m | 2 +- src/octave/NLOPT_AUGLAG_EQ.m | 2 +- src/octave/NLOPT_GD_MLSL.m | 2 +- src/octave/NLOPT_GD_MLSL_LDS.m | 2 +- src/octave/NLOPT_GN_AGS.m | 2 +- src/octave/NLOPT_GN_CRS2_LM.m | 2 +- src/octave/NLOPT_GN_ESCH.m | 2 +- src/octave/NLOPT_GN_ISRES.m | 2 +- src/octave/NLOPT_GN_MLSL.m | 2 +- src/octave/NLOPT_GN_MLSL_LDS.m | 2 +- src/octave/NLOPT_G_MLSL.m | 2 +- src/octave/NLOPT_G_MLSL_LDS.m | 2 +- src/octave/NLOPT_LD_AUGLAG.m | 2 +- src/octave/NLOPT_LD_AUGLAG_EQ.m | 2 +- src/octave/NLOPT_LD_CCSAQ.m | 2 +- src/octave/NLOPT_LD_LBFGS.m | 2 +- src/octave/NLOPT_LD_LBFGS_NOCEDAL.m | 5 ---- src/octave/NLOPT_LD_MMA.m | 2 +- src/octave/NLOPT_LD_SLSQP.m | 2 +- src/octave/NLOPT_LD_TNEWTON.m | 2 +- src/octave/NLOPT_LD_TNEWTON_PRECOND.m | 2 +- src/octave/NLOPT_LD_TNEWTON_PRECOND_RESTART.m | 2 +- src/octave/NLOPT_LD_TNEWTON_RESTART.m | 2 +- src/octave/NLOPT_LD_VAR1.m | 2 +- src/octave/NLOPT_LD_VAR2.m | 2 +- src/octave/NLOPT_LN_AUGLAG.m | 2 +- src/octave/NLOPT_LN_AUGLAG_EQ.m | 2 +- src/octave/NLOPT_LN_BOBYQA.m | 2 +- src/octave/NLOPT_LN_COBYLA.m | 2 +- src/octave/NLOPT_LN_NELDERMEAD.m | 2 +- src/octave/NLOPT_LN_NEWUOA.m | 2 +- src/octave/NLOPT_LN_NEWUOA_BOUND.m | 2 +- src/octave/NLOPT_LN_PRAXIS.m | 2 +- src/octave/NLOPT_LN_SBPLX.m | 2 +- src/octave/nlopt_minimize.m | 2 +- src/octave/nlopt_minimize_constrained.m | 2 +- src/octave/nlopt_optimize.m | 2 +- test/CMakeLists.txt | 26 +++++++------------ 42 files changed, 48 insertions(+), 63 deletions(-) delete mode 100644 src/octave/NLOPT_LD_LBFGS_NOCEDAL.m diff --git a/NEWS.md b/NEWS.md index e0295157..db619564 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,8 @@ * New `NLOPT_LUKSAN` cmake option to build without Luksan LGPL code ([#569]). +* Dropped unused LD_LBFGS_NOCEDAL enum value. + * Various minor bugfixes ([#566], [#564], [#571], [#465], [#563], [#504], [#187]) ## NLopt 2.8 diff --git a/src/api/general.c b/src/api/general.c index c4ca27eb..26a203d5 100644 --- a/src/api/general.c +++ b/src/api/general.c @@ -50,7 +50,6 @@ static const char nlopt_algorithm_names[NLOPT_NUM_ALGORITHMS][256] = { "StoGO (NOT COMPILED)", "StoGO randomized (NOT COMPILED)", #endif - "original L-BFGS code by Nocedal et al. (NOT COMPILED)", "Limited-memory BFGS (L-BFGS) (local, derivative-based)", "Principal-axis, praxis (local, no-derivative)", "Limited-memory variable-metric, rank 1 (local, derivative-based)", @@ -114,7 +113,6 @@ const char *nlopt_algorithm_to_string(nlopt_algorithm algorithm) case NLOPT_GN_ORIG_DIRECT_L: return "GN_ORIG_DIRECT_L"; case NLOPT_GD_STOGO: return "GD_STOGO"; case NLOPT_GD_STOGO_RAND: return "GD_STOGO_RAND"; - case NLOPT_LD_LBFGS_NOCEDAL: return "LD_LBFGS_NOCEDAL"; case NLOPT_LD_LBFGS: return "LD_LBFGS"; case NLOPT_LN_PRAXIS: return "LN_PRAXIS"; case NLOPT_LD_VAR1: return "LD_VAR1"; diff --git a/src/api/nlopt.h b/src/api/nlopt.h index 4f6fb142..0d8f9b30 100644 --- a/src/api/nlopt.h +++ b/src/api/nlopt.h @@ -95,8 +95,6 @@ typedef enum { NLOPT_GD_STOGO, NLOPT_GD_STOGO_RAND, - NLOPT_LD_LBFGS_NOCEDAL, - NLOPT_LD_LBFGS, NLOPT_LN_PRAXIS, diff --git a/src/octave/CMakeLists.txt b/src/octave/CMakeLists.txt index db797843..18690e6c 100644 --- a/src/octave/CMakeLists.txt +++ b/src/octave/CMakeLists.txt @@ -1,4 +1,4 @@ -set (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 NLOPT_AUGLAG.m NLOPT_AUGLAG_EQ.m NLOPT_G_MLSL.m NLOPT_G_MLSL_LDS.m NLOPT_LD_SLSQP.m NLOPT_LD_CCSAQ.m NLOPT_GN_ESCH.m NLOPT_GN_AGS.m) +set (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.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 NLOPT_AUGLAG.m NLOPT_AUGLAG_EQ.m NLOPT_G_MLSL.m NLOPT_G_MLSL_LDS.m NLOPT_LD_SLSQP.m NLOPT_LD_CCSAQ.m NLOPT_GN_ESCH.m NLOPT_GN_AGS.m) set (M_DATA ${MFILES} nlopt_minimize.m nlopt_minimize_constrained.m) diff --git a/src/octave/NLOPT_AUGLAG.m b/src/octave/NLOPT_AUGLAG.m index cd51cb1d..eea45a41 100644 --- a/src/octave/NLOPT_AUGLAG.m +++ b/src/octave/NLOPT_AUGLAG.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_AUGLAG - val = 36; + val = 35; diff --git a/src/octave/NLOPT_AUGLAG_EQ.m b/src/octave/NLOPT_AUGLAG_EQ.m index 2177c65e..9f829424 100644 --- a/src/octave/NLOPT_AUGLAG_EQ.m +++ b/src/octave/NLOPT_AUGLAG_EQ.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_AUGLAG_EQ - val = 37; + val = 36; diff --git a/src/octave/NLOPT_GD_MLSL.m b/src/octave/NLOPT_GD_MLSL.m index 9cc25ead..99d67376 100644 --- a/src/octave/NLOPT_GD_MLSL.m +++ b/src/octave/NLOPT_GD_MLSL.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_GD_MLSL - val = 21; + val = 20; diff --git a/src/octave/NLOPT_GD_MLSL_LDS.m b/src/octave/NLOPT_GD_MLSL_LDS.m index 73c1ef19..e81735ee 100644 --- a/src/octave/NLOPT_GD_MLSL_LDS.m +++ b/src/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 = 22; diff --git a/src/octave/NLOPT_GN_AGS.m b/src/octave/NLOPT_GN_AGS.m index d2e696e8..eabd81b3 100644 --- a/src/octave/NLOPT_GN_AGS.m +++ b/src/octave/NLOPT_GN_AGS.m @@ -3,4 +3,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_GN_AGS - val = 43; + val = 42; diff --git a/src/octave/NLOPT_GN_CRS2_LM.m b/src/octave/NLOPT_GN_CRS2_LM.m index bde02d14..9b212ac1 100644 --- a/src/octave/NLOPT_GN_CRS2_LM.m +++ b/src/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 = 18; diff --git a/src/octave/NLOPT_GN_ESCH.m b/src/octave/NLOPT_GN_ESCH.m index 5d8f6366..ad12f5f8 100644 --- a/src/octave/NLOPT_GN_ESCH.m +++ b/src/octave/NLOPT_GN_ESCH.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_GN_ESCH - val = 42; + val = 41; diff --git a/src/octave/NLOPT_GN_ISRES.m b/src/octave/NLOPT_GN_ISRES.m index 9eaaa07f..7adc6d81 100644 --- a/src/octave/NLOPT_GN_ISRES.m +++ b/src/octave/NLOPT_GN_ISRES.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_GN_ISRES - val = 35; + val = 34; diff --git a/src/octave/NLOPT_GN_MLSL.m b/src/octave/NLOPT_GN_MLSL.m index 4642de00..9553a50c 100644 --- a/src/octave/NLOPT_GN_MLSL.m +++ b/src/octave/NLOPT_GN_MLSL.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_GN_MLSL - val = 20; + val = 19; diff --git a/src/octave/NLOPT_GN_MLSL_LDS.m b/src/octave/NLOPT_GN_MLSL_LDS.m index bdde5ba2..00ba2eae 100644 --- a/src/octave/NLOPT_GN_MLSL_LDS.m +++ b/src/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 = 21; diff --git a/src/octave/NLOPT_G_MLSL.m b/src/octave/NLOPT_G_MLSL.m index f0c0abce..d3ba190a 100644 --- a/src/octave/NLOPT_G_MLSL.m +++ b/src/octave/NLOPT_G_MLSL.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_G_MLSL - val = 38; + val = 37; diff --git a/src/octave/NLOPT_G_MLSL_LDS.m b/src/octave/NLOPT_G_MLSL_LDS.m index 254023ef..9bd25eee 100644 --- a/src/octave/NLOPT_G_MLSL_LDS.m +++ b/src/octave/NLOPT_G_MLSL_LDS.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_G_MLSL_LDS - val = 39; + val = 38; diff --git a/src/octave/NLOPT_LD_AUGLAG.m b/src/octave/NLOPT_LD_AUGLAG.m index 704520b4..245945fe 100644 --- a/src/octave/NLOPT_LD_AUGLAG.m +++ b/src/octave/NLOPT_LD_AUGLAG.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LD_AUGLAG - val = 31; + val = 30; diff --git a/src/octave/NLOPT_LD_AUGLAG_EQ.m b/src/octave/NLOPT_LD_AUGLAG_EQ.m index e327ddb9..212b6435 100644 --- a/src/octave/NLOPT_LD_AUGLAG_EQ.m +++ b/src/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 = 32; diff --git a/src/octave/NLOPT_LD_CCSAQ.m b/src/octave/NLOPT_LD_CCSAQ.m index f72335c3..2b688e5a 100644 --- a/src/octave/NLOPT_LD_CCSAQ.m +++ b/src/octave/NLOPT_LD_CCSAQ.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LD_CCSAQ - val = 41; + val = 40; diff --git a/src/octave/NLOPT_LD_LBFGS.m b/src/octave/NLOPT_LD_LBFGS.m index 5c52378e..7b363eb7 100644 --- a/src/octave/NLOPT_LD_LBFGS.m +++ b/src/octave/NLOPT_LD_LBFGS.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LD_LBFGS - val = 11; + val = 10; diff --git a/src/octave/NLOPT_LD_LBFGS_NOCEDAL.m b/src/octave/NLOPT_LD_LBFGS_NOCEDAL.m deleted file mode 100644 index f20c00a6..00000000 --- a/src/octave/NLOPT_LD_LBFGS_NOCEDAL.m +++ /dev/null @@ -1,5 +0,0 @@ -% NLOPT_LD_LBFGS_NOCEDAL: original NON-FREE L-BFGS code by Nocedal et al. (NOT COMPILED) -% -% See nlopt_minimize for more information. -function val = NLOPT_LD_LBFGS_NOCEDAL - val = 10; diff --git a/src/octave/NLOPT_LD_MMA.m b/src/octave/NLOPT_LD_MMA.m index a7b3ca65..d3ef12e5 100644 --- a/src/octave/NLOPT_LD_MMA.m +++ b/src/octave/NLOPT_LD_MMA.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LD_MMA - val = 24; + val = 23; diff --git a/src/octave/NLOPT_LD_SLSQP.m b/src/octave/NLOPT_LD_SLSQP.m index be949c0e..87075b7b 100644 --- a/src/octave/NLOPT_LD_SLSQP.m +++ b/src/octave/NLOPT_LD_SLSQP.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LD_SLSQP - val = 40; + val = 39; diff --git a/src/octave/NLOPT_LD_TNEWTON.m b/src/octave/NLOPT_LD_TNEWTON.m index 60fb2d78..3efd02ec 100644 --- a/src/octave/NLOPT_LD_TNEWTON.m +++ b/src/octave/NLOPT_LD_TNEWTON.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LD_TNEWTON - val = 15; + val = 14; diff --git a/src/octave/NLOPT_LD_TNEWTON_PRECOND.m b/src/octave/NLOPT_LD_TNEWTON_PRECOND.m index ab424792..05f22df5 100644 --- a/src/octave/NLOPT_LD_TNEWTON_PRECOND.m +++ b/src/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 = 16; diff --git a/src/octave/NLOPT_LD_TNEWTON_PRECOND_RESTART.m b/src/octave/NLOPT_LD_TNEWTON_PRECOND_RESTART.m index d1e42f75..e118c94a 100644 --- a/src/octave/NLOPT_LD_TNEWTON_PRECOND_RESTART.m +++ b/src/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 = 17; diff --git a/src/octave/NLOPT_LD_TNEWTON_RESTART.m b/src/octave/NLOPT_LD_TNEWTON_RESTART.m index 7ef9d755..7c98c747 100644 --- a/src/octave/NLOPT_LD_TNEWTON_RESTART.m +++ b/src/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 = 15; diff --git a/src/octave/NLOPT_LD_VAR1.m b/src/octave/NLOPT_LD_VAR1.m index 0385562c..58a6a1e7 100644 --- a/src/octave/NLOPT_LD_VAR1.m +++ b/src/octave/NLOPT_LD_VAR1.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LD_VAR1 - val = 13; + val = 12; diff --git a/src/octave/NLOPT_LD_VAR2.m b/src/octave/NLOPT_LD_VAR2.m index fd9c2291..8054f849 100644 --- a/src/octave/NLOPT_LD_VAR2.m +++ b/src/octave/NLOPT_LD_VAR2.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LD_VAR2 - val = 14; + val = 13; diff --git a/src/octave/NLOPT_LN_AUGLAG.m b/src/octave/NLOPT_LN_AUGLAG.m index b204237f..83dea8da 100644 --- a/src/octave/NLOPT_LN_AUGLAG.m +++ b/src/octave/NLOPT_LN_AUGLAG.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LN_AUGLAG - val = 30; + val = 29; diff --git a/src/octave/NLOPT_LN_AUGLAG_EQ.m b/src/octave/NLOPT_LN_AUGLAG_EQ.m index 5cc7e007..8cb302f4 100644 --- a/src/octave/NLOPT_LN_AUGLAG_EQ.m +++ b/src/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 = 31; diff --git a/src/octave/NLOPT_LN_BOBYQA.m b/src/octave/NLOPT_LN_BOBYQA.m index 738946ee..1980f281 100644 --- a/src/octave/NLOPT_LN_BOBYQA.m +++ b/src/octave/NLOPT_LN_BOBYQA.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LN_BOBYQA - val = 34; + val = 33; diff --git a/src/octave/NLOPT_LN_COBYLA.m b/src/octave/NLOPT_LN_COBYLA.m index 418f0e6d..2bdc6aa6 100644 --- a/src/octave/NLOPT_LN_COBYLA.m +++ b/src/octave/NLOPT_LN_COBYLA.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LN_COBYLA - val = 25; + val = 24; diff --git a/src/octave/NLOPT_LN_NELDERMEAD.m b/src/octave/NLOPT_LN_NELDERMEAD.m index 9297a9ce..9fb46157 100644 --- a/src/octave/NLOPT_LN_NELDERMEAD.m +++ b/src/octave/NLOPT_LN_NELDERMEAD.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LN_NELDERMEAD - val = 28; + val = 27; diff --git a/src/octave/NLOPT_LN_NEWUOA.m b/src/octave/NLOPT_LN_NEWUOA.m index a4b2b9ec..9ab09ca9 100644 --- a/src/octave/NLOPT_LN_NEWUOA.m +++ b/src/octave/NLOPT_LN_NEWUOA.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LN_NEWUOA - val = 26; + val = 25; diff --git a/src/octave/NLOPT_LN_NEWUOA_BOUND.m b/src/octave/NLOPT_LN_NEWUOA_BOUND.m index 44591f1c..957fd686 100644 --- a/src/octave/NLOPT_LN_NEWUOA_BOUND.m +++ b/src/octave/NLOPT_LN_NEWUOA_BOUND.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LN_NEWUOA_BOUND - val = 27; + val = 26; diff --git a/src/octave/NLOPT_LN_PRAXIS.m b/src/octave/NLOPT_LN_PRAXIS.m index c768caed..21842f8a 100644 --- a/src/octave/NLOPT_LN_PRAXIS.m +++ b/src/octave/NLOPT_LN_PRAXIS.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LN_PRAXIS - val = 12; + val = 11; diff --git a/src/octave/NLOPT_LN_SBPLX.m b/src/octave/NLOPT_LN_SBPLX.m index a1f04df0..b4b222a6 100644 --- a/src/octave/NLOPT_LN_SBPLX.m +++ b/src/octave/NLOPT_LN_SBPLX.m @@ -2,4 +2,4 @@ % % See nlopt_minimize for more information. function val = NLOPT_LN_SBPLX - val = 29; + val = 28; diff --git a/src/octave/nlopt_minimize.m b/src/octave/nlopt_minimize.m index ea2b100f..2695b5c5 100644 --- a/src/octave/nlopt_minimize.m +++ b/src/octave/nlopt_minimize.m @@ -57,7 +57,7 @@ % NLOPT_GN_DIRECT_L_RAND, NLOPT_GN_DIRECT_L_RAND_NOSCAL, NLOPT_GN_DIRECT, % NLOPT_GN_DIRECT_NOSCAL, NLOPT_GN_ISRES, NLOPT_GN_MLSL_LDS, NLOPT_GN_MLSL, % NLOPT_GN_ORIG_DIRECT_L, NLOPT_GN_ORIG_DIRECT, NLOPT_LD_AUGLAG_EQ, -% NLOPT_LD_AUGLAG, NLOPT_LD_LBFGS, NLOPT_LD_LBFGS_NOCEDAL, NLOPT_LD_MMA, +% NLOPT_LD_AUGLAG, NLOPT_LD_LBFGS, NLOPT_LD_MMA, % NLOPT_LD_TNEWTON, NLOPT_LD_TNEWTON_PRECOND, % NLOPT_LD_TNEWTON_PRECOND_RESTART, NLOPT_LD_TNEWTON_RESTART, % NLOPT_LD_VAR1, NLOPT_LD_VAR2, NLOPT_LN_AUGLAG_EQ, NLOPT_LN_AUGLAG, diff --git a/src/octave/nlopt_minimize_constrained.m b/src/octave/nlopt_minimize_constrained.m index 8d3cee67..a3e3b66a 100644 --- a/src/octave/nlopt_minimize_constrained.m +++ b/src/octave/nlopt_minimize_constrained.m @@ -78,7 +78,7 @@ % NLOPT_GN_DIRECT_L_RAND, NLOPT_GN_DIRECT_L_RAND_NOSCAL, NLOPT_GN_DIRECT, % NLOPT_GN_DIRECT_NOSCAL, NLOPT_GN_ISRES, NLOPT_GN_MLSL_LDS, NLOPT_GN_MLSL, % NLOPT_GN_ORIG_DIRECT_L, NLOPT_GN_ORIG_DIRECT, NLOPT_LD_AUGLAG_EQ, -% NLOPT_LD_AUGLAG, NLOPT_LD_LBFGS, NLOPT_LD_LBFGS_NOCEDAL, NLOPT_LD_MMA, +% NLOPT_LD_AUGLAG, NLOPT_LD_LBFGS, NLOPT_LD_MMA, % NLOPT_LD_TNEWTON, NLOPT_LD_TNEWTON_PRECOND, % NLOPT_LD_TNEWTON_PRECOND_RESTART, NLOPT_LD_TNEWTON_RESTART, % NLOPT_LD_VAR1, NLOPT_LD_VAR2, NLOPT_LN_AUGLAG_EQ, NLOPT_LN_AUGLAG, diff --git a/src/octave/nlopt_optimize.m b/src/octave/nlopt_optimize.m index 13776892..f08965f0 100644 --- a/src/octave/nlopt_optimize.m +++ b/src/octave/nlopt_optimize.m @@ -87,7 +87,7 @@ % NLOPT_GN_DIRECT_L_RAND, NLOPT_GN_DIRECT_L_RAND_NOSCAL, NLOPT_GN_DIRECT, % NLOPT_GN_DIRECT_NOSCAL, NLOPT_GN_ISRES, NLOPT_GN_MLSL_LDS, NLOPT_GN_MLSL, % NLOPT_GN_ORIG_DIRECT_L, NLOPT_GN_ORIG_DIRECT, NLOPT_LD_AUGLAG_EQ, -% NLOPT_LD_AUGLAG, NLOPT_LD_LBFGS, NLOPT_LD_LBFGS_NOCEDAL, NLOPT_LD_MMA, +% NLOPT_LD_AUGLAG, NLOPT_LD_LBFGS, NLOPT_LD_MMA, % NLOPT_LD_TNEWTON, NLOPT_LD_TNEWTON_PRECOND, % NLOPT_LD_TNEWTON_PRECOND_RESTART, NLOPT_LD_TNEWTON_RESTART, % NLOPT_LD_VAR1, NLOPT_LD_VAR2, NLOPT_LN_AUGLAG_EQ, NLOPT_LN_AUGLAG, diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1815343a..e346a98f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -14,12 +14,12 @@ macro(NLOPT_add_cpp_test test_name) endforeach() endmacro() -NLOPT_add_cpp_test(t_tutorial 24 25 31 40) +NLOPT_add_cpp_test(t_tutorial 23 24 30 39) NLOPT_add_cpp_test(cpp_functor) -NLOPT_add_cpp_test(t_bounded 0 1 2 3 4 5 6 7 8 19 35 42 43) +NLOPT_add_cpp_test(t_bounded 0 1 2 3 4 5 6 7 8 18 34 41 42) if (NOT NLOPT_CXX) - set_tests_properties (check_t_bounded_8 check_t_bounded_43 PROPERTIES DISABLED TRUE) + set_tests_properties (check_t_bounded_8 check_t_bounded_42 PROPERTIES DISABLED TRUE) endif () # have to add timer.c and mt19937ar.c as symbols are declared extern @@ -36,23 +36,15 @@ if (NLOPT_CXX) set_target_properties(testopt PROPERTIES LINKER_LANGUAGE CXX) endif () -foreach (algo_index RANGE 29)# 43 - foreach (obj_index RANGE 1)# 21 +foreach (algo_index RANGE 28) # 42 + foreach (obj_index RANGE 1) # 21 set (enable_ TRUE) - # cxx stogo + # cxx ags/stogo if (NOT NLOPT_CXX) - if (algo_index STREQUAL 8 OR algo_index STREQUAL 9) + if (algo_index STREQUAL 8 OR algo_index STREQUAL 9 OR algo_index STREQUAL 42) set (enable_ FALSE) endif () endif () - # cxx ags - if (NOT NLOPT_CXX AND algo_index STREQUAL 43) - set (enable_ FALSE) - endif () - # L-BFGS - if (algo_index STREQUAL 10) - set (enable_ FALSE) - endif () if (enable_) add_test (NAME testopt_algo${algo_index}_obj${obj_index} COMMAND testopt -r 0 -a ${algo_index} -o ${obj_index}) if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows) @@ -60,7 +52,7 @@ foreach (algo_index RANGE 29)# 43 endif () # Check if LUKSAN targets are available. if (NOT NLOPT_LUKSAN) - set (list_of_algorithms_requiring_luksan 11 12 13 14 15 16 17 18) + set (list_of_algorithms_requiring_luksan 10 11 12 13 14 15 16 17) if (algo_index IN_LIST list_of_algorithms_requiring_luksan) set_tests_properties (testopt_algo${algo_index}_obj${obj_index} PROPERTIES DISABLED TRUE) endif() @@ -74,7 +66,7 @@ if (Python_FOUND AND NUMPY_FOUND AND (SWIG_FOUND OR (EXISTS ${PROJECT_SOURCE_DIR "PYTHONPATH=${PROJECT_BINARY_DIR}/src/swig" ) - foreach (algo_index 24 25 31 40) + foreach (algo_index 23 24 30 39) add_test (NAME test_python${algo_index} COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/t_python.py ${algo_index}) set_tests_properties (test_python${algo_index} PROPERTIES ENVIRONMENT "${PYINSTALLCHECK_ENVIRONMENT}") endforeach()