Commit 1dfa59c1 authored by Konstantinos Chatzilygeroudis's avatar Konstantinos Chatzilygeroudis
Browse files

Final fixes in NLOpt algorithms

parent c93d8396
......@@ -118,6 +118,7 @@ namespace limbo {
{
// Assert that the algorithm is gradient-based
// TO-DO: Add support for MLSL (Multi-Level Single-Linkage)
// TO-DO: Add better support for AUGLAG and AUGLAG_EQ
// clang-format off
static_assert(Algorithm == nlopt::LD_MMA || Algorithm == nlopt::LD_SLSQP ||
Algorithm == nlopt::LD_LBFGS || Algorithm == nlopt::LD_TNEWTON_PRECOND_RESTART ||
......@@ -125,7 +126,6 @@ namespace limbo {
Algorithm == nlopt::LD_TNEWTON || Algorithm == nlopt::LD_VAR2 ||
Algorithm == nlopt::LD_VAR1 || Algorithm == nlopt::GD_STOGO ||
Algorithm == nlopt::GD_STOGO_RAND || Algorithm == nlopt::LD_LBFGS_NOCEDAL ||
// Algorithm == nlopt::GD_MLSL || Algorithm == nlopt::GD_MLSL_LDS ||
Algorithm == nlopt::LD_AUGLAG || Algorithm == nlopt::LD_AUGLAG_EQ ||
Algorithm == nlopt::LD_CCSAQ, "NLOptGrad accepts gradient-based nlopt algorithms only");
// clang-format on
......
......@@ -122,7 +122,7 @@ namespace limbo {
{
// Assert that the algorithm is non-gradient
// TO-DO: Add support for MLSL (Multi-Level Single-Linkage)
// TO-DO: Add support for AUGLAG and AUGLAG_EQ
// TO-DO: Add better support for AUGLAG and AUGLAG_EQ
// TO-DO: Add better support for ISRES (Improved Stochastic Ranking Evolution Strategy)
// clang-format off
static_assert(Algorithm == nlopt::LN_COBYLA || Algorithm == nlopt::LN_BOBYQA ||
......@@ -133,7 +133,7 @@ namespace limbo {
Algorithm == nlopt::GN_DIRECT_NOSCAL || Algorithm == nlopt::GN_DIRECT_L_NOSCAL ||
Algorithm == nlopt::GN_DIRECT_L_RAND_NOSCAL || Algorithm == nlopt::GN_ORIG_DIRECT ||
Algorithm == nlopt::GN_ORIG_DIRECT_L || Algorithm == nlopt::GN_CRS2_LM ||
Algorithm == nlopt::GD_STOGO || Algorithm == nlopt::GD_STOGO_RAND ||
Algorithm == nlopt::LN_AUGLAG || Algorithm == nlopt::LN_AUGLAG_EQ ||
Algorithm == nlopt::GN_ISRES || Algorithm == nlopt::GN_ESCH, "NLOptNoGrad accepts gradient free nlopt algorithms only");
// clang-format on
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment