From 7dfbbe2b6152251e449721eaf971833a7f83a28a Mon Sep 17 00:00:00 2001 From: Dario Izzo Date: Sat, 8 Apr 2017 14:28:17 +0200 Subject: [PATCH 1/2] [skip ci] forgotten from #69 --- doc/sphinx/docs/cpp/cpp_docs.rst | 1 + doc/sphinx/docs/cpp/problems/luksan_vlcek1.rst | 5 +++++ include/pagmo/problems/luksan_vlcek1.hpp | 15 +++++++-------- 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 doc/sphinx/docs/cpp/problems/luksan_vlcek1.rst diff --git a/doc/sphinx/docs/cpp/cpp_docs.rst b/doc/sphinx/docs/cpp/cpp_docs.rst index 3c4c04a2b..2f0303b5e 100644 --- a/doc/sphinx/docs/cpp/cpp_docs.rst +++ b/doc/sphinx/docs/cpp/cpp_docs.rst @@ -60,6 +60,7 @@ Implemented problems problems/cec2009 problems/cec2013 problems/unconstrain + problems/luksan_vlcek1 Implemented islands ^^^^^^^^^^^^^^^^^^^ diff --git a/doc/sphinx/docs/cpp/problems/luksan_vlcek1.rst b/doc/sphinx/docs/cpp/problems/luksan_vlcek1.rst new file mode 100644 index 000000000..4c6717d47 --- /dev/null +++ b/doc/sphinx/docs/cpp/problems/luksan_vlcek1.rst @@ -0,0 +1,5 @@ +Luksan Vlceck 1 +=============== + +.. doxygenstruct:: pagmo::luksan_vlcek1 + :members: diff --git a/include/pagmo/problems/luksan_vlcek1.hpp b/include/pagmo/problems/luksan_vlcek1.hpp index 084e35123..5e3036853 100644 --- a/include/pagmo/problems/luksan_vlcek1.hpp +++ b/include/pagmo/problems/luksan_vlcek1.hpp @@ -51,16 +51,15 @@ namespace pagmo * The problem is the Chained Rosenbrock function with trigonometric-exponential * constraints. * - * Its formulation in pagmo can be written as: + * Its formulation can be written as: * * \f[ - * \begin{array}{rl} - * \mbox{find:} & -5 \le \mathbf x_i \le 5, \forall i=1..n\\ - * \mbox{to minimize: } & \sum_{i=1}^{n-1}\left[100\left(x_i^2-x_{i+1}\right)^2 + \left(x_i-1\right)^2\right]\\ - * \mbox{subject to:} & 3x_{k+1}^3+2x_{k+2}-5+\sin(x_{k+1}-x_{k+2}})\sin(x_{k+1}+x_{k+2}}) - * +4x_{k+1}-x_k\exp(x_k-x_{k+1})-3 \le UB, \forall k=1..n-2 \\ - * & 3x_{k+1}^3+2x_{k+2}-5+\sin(x_{k+1}-x_{k+2}})\sin(x_{k+1}+x_{k+2}}) - * +4x_{k+1}-x_k\exp(x_k-x_{k+1})-3 \ge LB, \forall k=1..n-2 \\ + * \begin{array}{rl} + * \mbox{find:} & -5 \le x_i \le 5, \forall i=1..n \\ + * \mbox{to minimize: } & \sum_{i=1}^{n-1}\left[100\left(x_i^2-x_{i+1}\right)^2 + \left(x_i-1\right)^2\right] \\ + * \mbox{subject to:} & + * 3x_{k+1}^3+2x_{k+2}-5+\sin(x_{k+1}-x_{k+2})\sin(x_{k+1}+x_{k+2}) + \\ + * & +4x_{k+1}-x_k\exp(x_k-x_{k+1})-3 = 0, \forall k=1..n-2 * \end{array} * \f] * From 13123ef706c188351bfca291b6c3e9ceab00412d Mon Sep 17 00:00:00 2001 From: Dario Izzo Date: Sat, 8 Apr 2017 20:40:29 +0200 Subject: [PATCH 2/2] add ons --- doc/sphinx/docs/cpp/problems/luksan_vlcek1.rst | 2 +- include/pagmo/problems/luksan_vlcek1.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/sphinx/docs/cpp/problems/luksan_vlcek1.rst b/doc/sphinx/docs/cpp/problems/luksan_vlcek1.rst index 4c6717d47..1dbe93095 100644 --- a/doc/sphinx/docs/cpp/problems/luksan_vlcek1.rst +++ b/doc/sphinx/docs/cpp/problems/luksan_vlcek1.rst @@ -1,4 +1,4 @@ -Luksan Vlceck 1 +Luksan Vlcek 1 =============== .. doxygenstruct:: pagmo::luksan_vlcek1 diff --git a/include/pagmo/problems/luksan_vlcek1.hpp b/include/pagmo/problems/luksan_vlcek1.hpp index 5e3036853..5291676e0 100644 --- a/include/pagmo/problems/luksan_vlcek1.hpp +++ b/include/pagmo/problems/luksan_vlcek1.hpp @@ -122,12 +122,12 @@ struct luksan_vlcek1 { vector_double ub(m_dim, 5.); return {lb, ub}; } - /// Inequality constraint dimension + /// Equality constraint dimension /** * - * It returns the number of inequality constraints. + * It returns the number of equality constraints. * - * @return the number of inequality constraints. + * @return the number of equality constraints. */ vector_double::size_type get_nec() const {