Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[skip ci] forgotten from #69 #71

Merged
merged 2 commits into from
Apr 8, 2017
Merged

[skip ci] forgotten from #69 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dfbbe2
[skip ci] forgotten from #69
darioizzo Apr 8, 2017
13123ef
add ons
darioizzo Apr 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/sphinx/docs/cpp/cpp_docs.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Implemented problems
problems/cec2009
problems/cec2013
problems/unconstrain
problems/luksan_vlcek1

Implemented islands
^^^^^^^^^^^^^^^^^^^
Expand Down
5 changes: 5 additions & 0 deletions doc/sphinx/docs/cpp/problems/luksan_vlcek1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Luksan Vlcek 1
===============

.. doxygenstruct:: pagmo::luksan_vlcek1
:members:
21 changes: 10 additions & 11 deletions include/pagmo/problems/luksan_vlcek1.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there's a few places below where eq/ineq constraints are mixed up, in the comments and/or documentation.

* \end{array}
* \f]
*
Expand Down Expand Up @@ -123,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
{
Expand Down