Merge pull request #71 from darioizzo/master

[skip ci] forgotten from #69
esa · Apr 8, 2017 · 756e893 · 756e893
2 parents ee9335a + 13123ef
commit 756e893
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git 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
@@ -0,0 +1,5 @@
+Luksan Vlcek 1
+===============
+
+.. doxygenstruct:: pagmo::luksan_vlcek1
+   :members:
diff --git 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]
  *
@@ -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
     {