diff options
author | Harpreet | 2016-01-07 17:14:07 +0530 |
---|---|---|
committer | Harpreet | 2016-01-07 17:14:07 +0530 |
commit | dd3d72ae2cdb43311b4e501966f09694bbd3e505 (patch) | |
tree | 22a62596c6cae995f4693d75d52d96cd787c40b8 | |
parent | dad86bd42cdc2a0e56df9e0591879e5d26fd56fa (diff) | |
download | FOSSEE-Optimization-toolbox-dd3d72ae2cdb43311b4e501966f09694bbd3e505.tar.gz FOSSEE-Optimization-toolbox-dd3d72ae2cdb43311b4e501966f09694bbd3e505.tar.bz2 FOSSEE-Optimization-toolbox-dd3d72ae2cdb43311b4e501966f09694bbd3e505.zip |
lower bound, upper bound test added
45 files changed, 271 insertions, 118 deletions
diff --git a/help/en_US/lsqlin.xml b/help/en_US/lsqlin.xml index 0904933..8887f30 100644 --- a/help/en_US/lsqlin.xml +++ b/help/en_US/lsqlin.xml @@ -38,17 +38,17 @@ <title>Parameters</title> <variablelist> <varlistentry><term>C :</term> - <listitem><para> a matrix of double, represents the multiplier of the solution x in the expression C*x - d. Number of columns in C is equal to the number of elements in x.</para></listitem></varlistentry> + <listitem><para> a matrix of double, represents the multiplier of the solution x in the expression C⋅x - d. Number of columns in C is equal to the number of elements in x.</para></listitem></varlistentry> <varlistentry><term>d :</term> - <listitem><para> a vector of double, represents the additive constant term in the expression C*x - d. Number of elements in d is equal to the number of rows in C matrix.</para></listitem></varlistentry> + <listitem><para> a vector of double, represents the additive constant term in the expression C⋅x - d. Number of elements in d is equal to the number of rows in C matrix.</para></listitem></varlistentry> <varlistentry><term>A :</term> - <listitem><para> a vector of double, represents the linear coefficients in the inequality constraints</para></listitem></varlistentry> + <listitem><para> a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.</para></listitem></varlistentry> <varlistentry><term>b :</term> - <listitem><para> a vector of double, represents the linear coefficients in the inequality constraints</para></listitem></varlistentry> + <listitem><para> a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.</para></listitem></varlistentry> <varlistentry><term>Aeq :</term> - <listitem><para> a matrix of double, represents the linear coefficients in the equality constraints</para></listitem></varlistentry> + <listitem><para> a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.</para></listitem></varlistentry> <varlistentry><term>beq :</term> - <listitem><para> a vector of double, represents the linear coefficients in the equality constraints</para></listitem></varlistentry> + <listitem><para> a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.</para></listitem></varlistentry> <varlistentry><term>lb :</term> <listitem><para> a vector of double, contains lower bounds of the variables.</para></listitem></varlistentry> <varlistentry><term>ub :</term> @@ -60,9 +60,9 @@ <varlistentry><term>xopt :</term> <listitem><para> a vector of double, the computed solution of the optimization problem.</para></listitem></varlistentry> <varlistentry><term>resnorm :</term> - <listitem><para> a double, objective value returned as the scalar value norm(C*x-d)^2.</para></listitem></varlistentry> + <listitem><para> a double, objective value returned as the scalar value norm(C⋅x-d)^2.</para></listitem></varlistentry> <varlistentry><term>residual :</term> - <listitem><para> a vector of double, solution residuals returned as the vector d-C*x.</para></listitem></varlistentry> + <listitem><para> a vector of double, solution residuals returned as the vector d-C⋅x.</para></listitem></varlistentry> <varlistentry><term>exitflag :</term> <listitem><para> The exit status. See below for details.</para></listitem></varlistentry> <varlistentry><term>output :</term> diff --git a/help/en_US/lsqnonneg.xml b/help/en_US/lsqnonneg.xml index 201e878..07cf7e6 100644 --- a/help/en_US/lsqnonneg.xml +++ b/help/en_US/lsqnonneg.xml @@ -35,15 +35,15 @@ <title>Parameters</title> <variablelist> <varlistentry><term>C :</term> - <listitem><para> a matrix of double, represents the multiplier of the solution x in the expression C*x - d. Number of columns in C is equal to the number of elements in x.</para></listitem></varlistentry> + <listitem><para> a matrix of double, represents the multiplier of the solution x in the expression C⋅x - d. Number of columns in C is equal to the number of elements in x.</para></listitem></varlistentry> <varlistentry><term>d :</term> - <listitem><para> a vector of double, represents the additive constant term in the expression C*x - d. Number of elements in d is equal to the number of rows in C matrix.</para></listitem></varlistentry> + <listitem><para> a vector of double, represents the additive constant term in the expression C⋅x - d. Number of elements in d is equal to the number of rows in C matrix.</para></listitem></varlistentry> <varlistentry><term>xopt :</term> <listitem><para> a vector of double, the computed solution of the optimization problem.</para></listitem></varlistentry> <varlistentry><term>resnorm :</term> - <listitem><para> a double, objective value returned as the scalar value norm(C*x-d)^2.</para></listitem></varlistentry> + <listitem><para> a double, objective value returned as the scalar value norm(C⋅x-d)^2.</para></listitem></varlistentry> <varlistentry><term>residual :</term> - <listitem><para> a vector of double, solution residuals returned as the vector d-C*x.</para></listitem></varlistentry> + <listitem><para> a vector of double, solution residuals returned as the vector d-C⋅x.</para></listitem></varlistentry> <varlistentry><term>exitflag :</term> <listitem><para> The exit status. See below for details.</para></listitem></varlistentry> <varlistentry><term>output :</term> diff --git a/help/en_US/qpipopt.xml b/help/en_US/qpipopt.xml index 170b457..a309a94 100644 --- a/help/en_US/qpipopt.xml +++ b/help/en_US/qpipopt.xml @@ -48,11 +48,11 @@ <varlistentry><term>ub :</term> <listitem><para> a vector of double, contains upper bounds of the variables.</para></listitem></varlistentry> <varlistentry><term>A :</term> - <listitem><para> a matrix of double, contains the constraint matrix</para></listitem></varlistentry> + <listitem><para> a matrix of double, contains the constraint matrix conLB ≤ A⋅x ≤ conUB.</para></listitem></varlistentry> <varlistentry><term>conLB :</term> - <listitem><para> a vector of double, contains lower bounds of the constraints.</para></listitem></varlistentry> + <listitem><para> a vector of double, contains lower bounds of the constraints conLB ≤ A⋅x ≤ conUB.</para></listitem></varlistentry> <varlistentry><term>conUB :</term> - <listitem><para> a vector of double, contains upper bounds of the constraints.</para></listitem></varlistentry> + <listitem><para> a vector of double, contains upper bounds of the constraints conLB ≤ A⋅x ≤ conUB.</para></listitem></varlistentry> <varlistentry><term>x0 :</term> <listitem><para> a vector of double, contains initial guess of variables.</para></listitem></varlistentry> <varlistentry><term>param :</term> diff --git a/help/en_US/qpipoptmat.xml b/help/en_US/qpipoptmat.xml index 82249a7..642971d 100644 --- a/help/en_US/qpipoptmat.xml +++ b/help/en_US/qpipoptmat.xml @@ -43,13 +43,13 @@ <varlistentry><term>f :</term> <listitem><para> a vector of double, represents coefficients of linear in the quadratic problem</para></listitem></varlistentry> <varlistentry><term>A :</term> - <listitem><para> a vector of double, represents the linear coefficients in the inequality constraints</para></listitem></varlistentry> + <listitem><para> a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.</para></listitem></varlistentry> <varlistentry><term>b :</term> - <listitem><para> a vector of double, represents the linear coefficients in the inequality constraints</para></listitem></varlistentry> + <listitem><para> a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.</para></listitem></varlistentry> <varlistentry><term>Aeq :</term> - <listitem><para> a matrix of double, represents the linear coefficients in the equality constraints</para></listitem></varlistentry> + <listitem><para> a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.</para></listitem></varlistentry> <varlistentry><term>beq :</term> - <listitem><para> a vector of double, represents the linear coefficients in the equality constraints</para></listitem></varlistentry> + <listitem><para> a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.</para></listitem></varlistentry> <varlistentry><term>lb :</term> <listitem><para> a vector of double, contains lower bounds of the variables.</para></listitem></varlistentry> <varlistentry><term>ub :</term> diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS Binary files differindex 8323669..2a1feb2 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB Binary files differindex ba30e61..386e0dd 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS Binary files differindex 6e8476f..465e052 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS Binary files differindex 9cd3f49..629f1cc 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA index f4e9ef7..dab0526 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA @@ -1,2 +1,2 @@ JavaSearch 1.0 -TMAP bs=2048 rt=1 fl=-1 id1=1280 id2=1 +TMAP bs=2048 rt=1 fl=-1 id1=1279 id2=1 diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP Binary files differindex 12891d8..775c132 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP diff --git a/help/en_US/scilab_en_US_help/lsqlin.html b/help/en_US/scilab_en_US_help/lsqlin.html index 7dbb227..db24b63 100644 --- a/help/en_US/scilab_en_US_help/lsqlin.html +++ b/help/en_US/scilab_en_US_help/lsqlin.html @@ -46,17 +46,17 @@ <div class="refsection"><h3 class="title">Parameters</h3> <dl><dt><span class="term">C :</span> - <dd><p class="para">a matrix of double, represents the multiplier of the solution x in the expression C*x - d. Number of columns in C is equal to the number of elements in x.</p></dd></dt> + <dd><p class="para">a matrix of double, represents the multiplier of the solution x in the expression C⋅x - d. Number of columns in C is equal to the number of elements in x.</p></dd></dt> <dt><span class="term">d :</span> - <dd><p class="para">a vector of double, represents the additive constant term in the expression C*x - d. Number of elements in d is equal to the number of rows in C matrix.</p></dd></dt> + <dd><p class="para">a vector of double, represents the additive constant term in the expression C⋅x - d. Number of elements in d is equal to the number of rows in C matrix.</p></dd></dt> <dt><span class="term">A :</span> - <dd><p class="para">a vector of double, represents the linear coefficients in the inequality constraints</p></dd></dt> + <dd><p class="para">a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.</p></dd></dt> <dt><span class="term">b :</span> - <dd><p class="para">a vector of double, represents the linear coefficients in the inequality constraints</p></dd></dt> + <dd><p class="para">a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.</p></dd></dt> <dt><span class="term">Aeq :</span> - <dd><p class="para">a matrix of double, represents the linear coefficients in the equality constraints</p></dd></dt> + <dd><p class="para">a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.</p></dd></dt> <dt><span class="term">beq :</span> - <dd><p class="para">a vector of double, represents the linear coefficients in the equality constraints</p></dd></dt> + <dd><p class="para">a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.</p></dd></dt> <dt><span class="term">lb :</span> <dd><p class="para">a vector of double, contains lower bounds of the variables.</p></dd></dt> <dt><span class="term">ub :</span> @@ -68,9 +68,9 @@ <dt><span class="term">xopt :</span> <dd><p class="para">a vector of double, the computed solution of the optimization problem.</p></dd></dt> <dt><span class="term">resnorm :</span> - <dd><p class="para">a double, objective value returned as the scalar value norm(C*x-d)^2.</p></dd></dt> + <dd><p class="para">a double, objective value returned as the scalar value norm(C⋅x-d)^2.</p></dd></dt> <dt><span class="term">residual :</span> - <dd><p class="para">a vector of double, solution residuals returned as the vector d-C*x.</p></dd></dt> + <dd><p class="para">a vector of double, solution residuals returned as the vector d-C⋅x.</p></dd></dt> <dt><span class="term">exitflag :</span> <dd><p class="para">The exit status. See below for details.</p></dd></dt> <dt><span class="term">output :</span> diff --git a/help/en_US/scilab_en_US_help/lsqnonneg.html b/help/en_US/scilab_en_US_help/lsqnonneg.html index a8e6801..8de3559 100644 --- a/help/en_US/scilab_en_US_help/lsqnonneg.html +++ b/help/en_US/scilab_en_US_help/lsqnonneg.html @@ -43,15 +43,15 @@ <div class="refsection"><h3 class="title">Parameters</h3> <dl><dt><span class="term">C :</span> - <dd><p class="para">a matrix of double, represents the multiplier of the solution x in the expression C*x - d. Number of columns in C is equal to the number of elements in x.</p></dd></dt> + <dd><p class="para">a matrix of double, represents the multiplier of the solution x in the expression C⋅x - d. Number of columns in C is equal to the number of elements in x.</p></dd></dt> <dt><span class="term">d :</span> - <dd><p class="para">a vector of double, represents the additive constant term in the expression C*x - d. Number of elements in d is equal to the number of rows in C matrix.</p></dd></dt> + <dd><p class="para">a vector of double, represents the additive constant term in the expression C⋅x - d. Number of elements in d is equal to the number of rows in C matrix.</p></dd></dt> <dt><span class="term">xopt :</span> <dd><p class="para">a vector of double, the computed solution of the optimization problem.</p></dd></dt> <dt><span class="term">resnorm :</span> - <dd><p class="para">a double, objective value returned as the scalar value norm(C*x-d)^2.</p></dd></dt> + <dd><p class="para">a double, objective value returned as the scalar value norm(C⋅x-d)^2.</p></dd></dt> <dt><span class="term">residual :</span> - <dd><p class="para">a vector of double, solution residuals returned as the vector d-C*x.</p></dd></dt> + <dd><p class="para">a vector of double, solution residuals returned as the vector d-C⋅x.</p></dd></dt> <dt><span class="term">exitflag :</span> <dd><p class="para">The exit status. See below for details.</p></dd></dt> <dt><span class="term">output :</span> diff --git a/help/en_US/scilab_en_US_help/qpipopt.html b/help/en_US/scilab_en_US_help/qpipopt.html index fc08a81..19b4e44 100644 --- a/help/en_US/scilab_en_US_help/qpipopt.html +++ b/help/en_US/scilab_en_US_help/qpipopt.html @@ -56,11 +56,11 @@ <dt><span class="term">ub :</span> <dd><p class="para">a vector of double, contains upper bounds of the variables.</p></dd></dt> <dt><span class="term">A :</span> - <dd><p class="para">a matrix of double, contains the constraint matrix</p></dd></dt> + <dd><p class="para">a matrix of double, contains the constraint matrix conLB ≤ A⋅x ≤ conUB.</p></dd></dt> <dt><span class="term">conLB :</span> - <dd><p class="para">a vector of double, contains lower bounds of the constraints.</p></dd></dt> + <dd><p class="para">a vector of double, contains lower bounds of the constraints conLB ≤ A⋅x ≤ conUB.</p></dd></dt> <dt><span class="term">conUB :</span> - <dd><p class="para">a vector of double, contains upper bounds of the constraints.</p></dd></dt> + <dd><p class="para">a vector of double, contains upper bounds of the constraints conLB ≤ A⋅x ≤ conUB.</p></dd></dt> <dt><span class="term">x0 :</span> <dd><p class="para">a vector of double, contains initial guess of variables.</p></dd></dt> <dt><span class="term">param :</span> diff --git a/help/en_US/scilab_en_US_help/qpipoptmat.html b/help/en_US/scilab_en_US_help/qpipoptmat.html index 4a89648..5a6a5b6 100644 --- a/help/en_US/scilab_en_US_help/qpipoptmat.html +++ b/help/en_US/scilab_en_US_help/qpipoptmat.html @@ -51,13 +51,13 @@ <dt><span class="term">f :</span> <dd><p class="para">a vector of double, represents coefficients of linear in the quadratic problem</p></dd></dt> <dt><span class="term">A :</span> - <dd><p class="para">a vector of double, represents the linear coefficients in the inequality constraints</p></dd></dt> + <dd><p class="para">a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.</p></dd></dt> <dt><span class="term">b :</span> - <dd><p class="para">a vector of double, represents the linear coefficients in the inequality constraints</p></dd></dt> + <dd><p class="para">a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.</p></dd></dt> <dt><span class="term">Aeq :</span> - <dd><p class="para">a matrix of double, represents the linear coefficients in the equality constraints</p></dd></dt> + <dd><p class="para">a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.</p></dd></dt> <dt><span class="term">beq :</span> - <dd><p class="para">a vector of double, represents the linear coefficients in the equality constraints</p></dd></dt> + <dd><p class="para">a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.</p></dd></dt> <dt><span class="term">lb :</span> <dd><p class="para">a vector of double, contains lower bounds of the variables.</p></dd></dt> <dt><span class="term">ub :</span> diff --git a/help/en_US/scilab_en_US_help/symphony.html b/help/en_US/scilab_en_US_help/symphony.html index d5b21cd..63c1db3 100644 --- a/help/en_US/scilab_en_US_help/symphony.html +++ b/help/en_US/scilab_en_US_help/symphony.html @@ -56,11 +56,11 @@ <dt><span class="term">ub :</span> <dd><p class="para">a vector of double, represents upper bounds of the variables.</p></dd></dt> <dt><span class="term">A :</span> - <dd><p class="para">a matrix of double, represents matrix representing the constraint matrix.</p></dd></dt> + <dd><p class="para">a matrix of double, represents matrix representing the constraint matrix conLB ≤ A⋅x ≤ conUB.</p></dd></dt> <dt><span class="term">conLB :</span> - <dd><p class="para">a vector of double, represents lower bounds of the constraints.</p></dd></dt> + <dd><p class="para">a vector of double, represents lower bounds of the constraints conLB ≤ A⋅x ≤ conUB.</p></dd></dt> <dt><span class="term">conUB :</span> - <dd><p class="para">a vector of double, represents upper bounds of the constraints</p></dd></dt> + <dd><p class="para">a vector of double, represents upper bounds of the constraints conLB ≤ A⋅x ≤ conUB.</p></dd></dt> <dt><span class="term">objSense :</span> <dd><p class="para">The sense (maximization/minimization) of the objective. Use 1(sym_minimize ) or -1 (sym_maximize) here.</p></dd></dt> <dt><span class="term">options :</span> diff --git a/help/en_US/scilab_en_US_help/symphonymat.html b/help/en_US/scilab_en_US_help/symphonymat.html index db8ffee..1f6af60 100644 --- a/help/en_US/scilab_en_US_help/symphonymat.html +++ b/help/en_US/scilab_en_US_help/symphonymat.html @@ -49,13 +49,13 @@ <dt><span class="term">intcon :</span> <dd><p class="para">Vector of integer constraints, specified as a vector of positive integers. The values in intcon indicate the components of the decision variable x that are integer-valued. intcon has values from 1 through number of variable.</p></dd></dt> <dt><span class="term">A :</span> - <dd><p class="para">Linear inequality constraint matrix, specified as a matrix of double. A represents the linear coefficients in the constraints A*x ≤ b. A has the size where columns equals to the number of variables.</p></dd></dt> + <dd><p class="para">a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.</p></dd></dt> <dt><span class="term">b :</span> - <dd><p class="para">Linear inequality constraint vector, specified as a vector of double. b represents the constant vector in the constraints A*x ≤ b. b has size equals to the number of rows in A.</p></dd></dt> + <dd><p class="para">a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.</p></dd></dt> <dt><span class="term">Aeq :</span> - <dd><p class="para">Linear equality constraint matrix, specified as a matrix of double. Aeq represents the linear coefficients in the constraints Aeq*x = beq. Aeq has the size where columns equals to the number of variables.</p></dd></dt> + <dd><p class="para">a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.</p></dd></dt> <dt><span class="term">beq :</span> - <dd><p class="para">Linear equality constraint vector, specified as a vector of double. beq represents the constant vector in the constraints Aeq*x = beq. beq has size equals to the number of rows in Aeq.</p></dd></dt> + <dd><p class="para">a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.</p></dd></dt> <dt><span class="term">lb :</span> <dd><p class="para">Lower bounds, specified as a vector or array of double. lb represents the lower bounds elementwise in lb ≤ x ≤ ub.</p></dd></dt> <dt><span class="term">ub :</span> diff --git a/help/en_US/symphony.xml b/help/en_US/symphony.xml index 68f1742..d11fafc 100644 --- a/help/en_US/symphony.xml +++ b/help/en_US/symphony.xml @@ -48,11 +48,11 @@ <varlistentry><term>ub :</term> <listitem><para> a vector of double, represents upper bounds of the variables.</para></listitem></varlistentry> <varlistentry><term>A :</term> - <listitem><para> a matrix of double, represents matrix representing the constraint matrix.</para></listitem></varlistentry> + <listitem><para> a matrix of double, represents matrix representing the constraint matrix conLB ≤ A⋅x ≤ conUB.</para></listitem></varlistentry> <varlistentry><term>conLB :</term> - <listitem><para> a vector of double, represents lower bounds of the constraints.</para></listitem></varlistentry> + <listitem><para> a vector of double, represents lower bounds of the constraints conLB ≤ A⋅x ≤ conUB.</para></listitem></varlistentry> <varlistentry><term>conUB :</term> - <listitem><para> a vector of double, represents upper bounds of the constraints</para></listitem></varlistentry> + <listitem><para> a vector of double, represents upper bounds of the constraints conLB ≤ A⋅x ≤ conUB.</para></listitem></varlistentry> <varlistentry><term>objSense :</term> <listitem><para> The sense (maximization/minimization) of the objective. Use 1(sym_minimize ) or -1 (sym_maximize) here.</para></listitem></varlistentry> <varlistentry><term>options :</term> diff --git a/help/en_US/symphonymat.xml b/help/en_US/symphonymat.xml index 33ed973..32059cb 100644 --- a/help/en_US/symphonymat.xml +++ b/help/en_US/symphonymat.xml @@ -41,13 +41,13 @@ <varlistentry><term>intcon :</term> <listitem><para> Vector of integer constraints, specified as a vector of positive integers. The values in intcon indicate the components of the decision variable x that are integer-valued. intcon has values from 1 through number of variable.</para></listitem></varlistentry> <varlistentry><term>A :</term> - <listitem><para> Linear inequality constraint matrix, specified as a matrix of double. A represents the linear coefficients in the constraints A*x ≤ b. A has the size where columns equals to the number of variables.</para></listitem></varlistentry> + <listitem><para> a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.</para></listitem></varlistentry> <varlistentry><term>b :</term> - <listitem><para> Linear inequality constraint vector, specified as a vector of double. b represents the constant vector in the constraints A*x ≤ b. b has size equals to the number of rows in A.</para></listitem></varlistentry> + <listitem><para> a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.</para></listitem></varlistentry> <varlistentry><term>Aeq :</term> - <listitem><para> Linear equality constraint matrix, specified as a matrix of double. Aeq represents the linear coefficients in the constraints Aeq*x = beq. Aeq has the size where columns equals to the number of variables.</para></listitem></varlistentry> + <listitem><para> a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.</para></listitem></varlistentry> <varlistentry><term>beq :</term> - <listitem><para> Linear equality constraint vector, specified as a vector of double. beq represents the constant vector in the constraints Aeq*x = beq. beq has size equals to the number of rows in Aeq.</para></listitem></varlistentry> + <listitem><para> a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.</para></listitem></varlistentry> <varlistentry><term>lb :</term> <listitem><para> Lower bounds, specified as a vector or array of double. lb represents the lower bounds elementwise in lb ≤ x ≤ ub.</para></listitem></varlistentry> <varlistentry><term>ub :</term> diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar Binary files differindex e7609d0..0289144 100644 --- a/jar/scilab_en_US_help.jar +++ b/jar/scilab_en_US_help.jar diff --git a/macros/lsqlin.bin b/macros/lsqlin.bin Binary files differindex 67446ac..eb02534 100644 --- a/macros/lsqlin.bin +++ b/macros/lsqlin.bin diff --git a/macros/lsqlin.sci b/macros/lsqlin.sci index 532e6ad..960b4db 100644 --- a/macros/lsqlin.sci +++ b/macros/lsqlin.sci @@ -22,19 +22,19 @@ function [xopt,resnorm,residual,exitflag,output,lambda] = lsqlin (varargin) // [xopt,resnorm,residual,exitflag,output,lambda] = lsqlin( ... ) // // Parameters - // C : a matrix of double, represents the multiplier of the solution x in the expression C*x - d. Number of columns in C is equal to the number of elements in x. - // d : a vector of double, represents the additive constant term in the expression C*x - d. Number of elements in d is equal to the number of rows in C matrix. - // A : a vector of double, represents the linear coefficients in the inequality constraints - // b : a vector of double, represents the linear coefficients in the inequality constraints - // Aeq : a matrix of double, represents the linear coefficients in the equality constraints - // beq : a vector of double, represents the linear coefficients in the equality constraints + // C : a matrix of double, represents the multiplier of the solution x in the expression C⋅x - d. Number of columns in C is equal to the number of elements in x. + // d : a vector of double, represents the additive constant term in the expression C⋅x - d. Number of elements in d is equal to the number of rows in C matrix. + // A : a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b. + // b : a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b. + // Aeq : a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq. + // beq : a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq. // lb : a vector of double, contains lower bounds of the variables. // ub : a vector of double, contains upper bounds of the variables. // x0 : a vector of double, contains initial guess of variables. // param : a list containing the parameters to be set. // xopt : a vector of double, the computed solution of the optimization problem. - // resnorm : a double, objective value returned as the scalar value norm(C*x-d)^2. - // residual : a vector of double, solution residuals returned as the vector d-C*x. + // resnorm : a double, objective value returned as the scalar value norm(C⋅x-d)^2. + // residual : a vector of double, solution residuals returned as the vector d-C⋅x. // exitflag : The exit status. See below for details. // output : The structure consist of statistics about the optimization. See below for details. // lambda : The structure consist of the Lagrange multipliers at the solution of problem. See below for details. @@ -341,6 +341,13 @@ function [xopt,resnorm,residual,exitflag,output,lambda] = lsqlin (varargin) end end + for i = 1:nbVar + if(lb(i)>ub(i)) + errmsg = msprintf(gettext("%s: Problem has inconsistent variable bounds"), "lsqlin"); + error(errmsg); + end + end + //Converting it into Quadratic Programming Problem H = C'*C; diff --git a/macros/lsqnonneg.bin b/macros/lsqnonneg.bin Binary files differindex bc44ed5..7ea7f4a 100644 --- a/macros/lsqnonneg.bin +++ b/macros/lsqnonneg.bin diff --git a/macros/lsqnonneg.sci b/macros/lsqnonneg.sci index d95ee86..3b152bf 100644 --- a/macros/lsqnonneg.sci +++ b/macros/lsqnonneg.sci @@ -19,11 +19,11 @@ function [xopt,resnorm,residual,exitflag,output,lambda] = lsqnonneg (varargin) // [xopt,resnorm,residual,exitflag,output,lambda] = lsqnonneg( ... ) // // Parameters - // C : a matrix of double, represents the multiplier of the solution x in the expression C*x - d. Number of columns in C is equal to the number of elements in x. - // d : a vector of double, represents the additive constant term in the expression C*x - d. Number of elements in d is equal to the number of rows in C matrix. + // C : a matrix of double, represents the multiplier of the solution x in the expression C⋅x - d. Number of columns in C is equal to the number of elements in x. + // d : a vector of double, represents the additive constant term in the expression C⋅x - d. Number of elements in d is equal to the number of rows in C matrix. // xopt : a vector of double, the computed solution of the optimization problem. - // resnorm : a double, objective value returned as the scalar value norm(C*x-d)^2. - // residual : a vector of double, solution residuals returned as the vector d-C*x. + // resnorm : a double, objective value returned as the scalar value norm(C⋅x-d)^2. + // residual : a vector of double, solution residuals returned as the vector d-C⋅x. // exitflag : The exit status. See below for details. // output : The structure consist of statistics about the optimization. See below for details. // lambda : The structure consist of the Lagrange multipliers at the solution of problem. See below for details. diff --git a/macros/qpipopt.bin b/macros/qpipopt.bin Binary files differindex 71c0d8e..d5e2bd1 100644 --- a/macros/qpipopt.bin +++ b/macros/qpipopt.bin diff --git a/macros/qpipopt.sci b/macros/qpipopt.sci index 33b31bb..25e7c07 100644 --- a/macros/qpipopt.sci +++ b/macros/qpipopt.sci @@ -26,9 +26,9 @@ function [xopt,fopt,exitflag,output,lambda] = qpipopt (varargin) // f : a vector of double, represents coefficients of linear in the quadratic problem // lb : a vector of double, contains lower bounds of the variables. // ub : a vector of double, contains upper bounds of the variables. - // A : a matrix of double, contains the constraint matrix - // conLB : a vector of double, contains lower bounds of the constraints. - // conUB : a vector of double, contains upper bounds of the constraints. + // A : a matrix of double, contains the constraint matrix conLB ≤ A⋅x ≤ conUB. + // conLB : a vector of double, contains lower bounds of the constraints conLB ≤ A⋅x ≤ conUB. + // conUB : a vector of double, contains upper bounds of the constraints conLB ≤ A⋅x ≤ conUB. // x0 : a vector of double, contains initial guess of variables. // param : a list containing the parameters to be set. // xopt : a vector of double, the computed solution of the optimization problem. @@ -345,6 +345,13 @@ function [xopt,fopt,exitflag,output,lambda] = qpipopt (varargin) end end + for i = 1:nbVar + if(lb(i)>ub(i)) + errmsg = msprintf(gettext("%s: Problem has inconsistent variable bounds"), "lsqlin"); + error(errmsg); + end + end + [xopt,fopt,status,iter,Zl,Zu,lmbda] = solveqp(nbVar,nbCon,H,f,A,conLB,conUB,lb,ub,x0,options); xopt = xopt'; diff --git a/macros/qpipoptmat.bin b/macros/qpipoptmat.bin Binary files differindex 5dd2df1..64e0b44 100644 --- a/macros/qpipoptmat.bin +++ b/macros/qpipoptmat.bin diff --git a/macros/qpipoptmat.sci b/macros/qpipoptmat.sci index f501094..b74c718 100644 --- a/macros/qpipoptmat.sci +++ b/macros/qpipoptmat.sci @@ -25,10 +25,10 @@ function [xopt,fopt,exitflag,output,lambda] = qpipoptmat (varargin) // Parameters // H : a symmetric matrix of double, represents coefficients of quadratic in the quadratic problem. // f : a vector of double, represents coefficients of linear in the quadratic problem - // A : a vector of double, represents the linear coefficients in the inequality constraints - // b : a vector of double, represents the linear coefficients in the inequality constraints - // Aeq : a matrix of double, represents the linear coefficients in the equality constraints - // beq : a vector of double, represents the linear coefficients in the equality constraints + // A : a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b. + // b : a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b. + // Aeq : a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq. + // beq : a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq. // lb : a vector of double, contains lower bounds of the variables. // ub : a vector of double, contains upper bounds of the variables. // x0 : a vector of double, contains initial guess of variables. @@ -352,6 +352,13 @@ function [xopt,fopt,exitflag,output,lambda] = qpipoptmat (varargin) error(errmsg); end end + + for i = 1:nbVar + if(lb(i)>ub(i)) + errmsg = msprintf(gettext("%s: Problem has inconsistent variable bounds"), "lsqlin"); + error(errmsg); + end + end //Converting it into ipopt format f = f'; diff --git a/macros/symphony.bin b/macros/symphony.bin Binary files differindex 0259139..b98094e 100644 --- a/macros/symphony.bin +++ b/macros/symphony.bin diff --git a/macros/symphony.sci b/macros/symphony.sci index 686eb5a..81b24fb 100644 --- a/macros/symphony.sci +++ b/macros/symphony.sci @@ -25,9 +25,9 @@ function [xopt,fopt,status,output] = symphony (varargin) // isInt : a vector of boolean, represents wether a variable is constrained to be an integer. // lb : a vector of double, represents lower bounds of the variables. // ub : a vector of double, represents upper bounds of the variables. - // A : a matrix of double, represents matrix representing the constraint matrix. - // conLB : a vector of double, represents lower bounds of the constraints. - // conUB : a vector of double, represents upper bounds of the constraints + // A : a matrix of double, represents matrix representing the constraint matrix conLB ≤ A⋅x ≤ conUB. + // conLB : a vector of double, represents lower bounds of the constraints conLB ≤ A⋅x ≤ conUB. + // conUB : a vector of double, represents upper bounds of the constraints conLB ≤ A⋅x ≤ conUB. // objSense : The sense (maximization/minimization) of the objective. Use 1(sym_minimize ) or -1 (sym_maximize) here. // options : a list containing the parameters to be set. // xopt : a vector of double, the computed solution of the optimization problem. diff --git a/macros/symphonymat.bin b/macros/symphonymat.bin Binary files differindex 5534f4d..ec35ee2 100644 --- a/macros/symphonymat.bin +++ b/macros/symphonymat.bin diff --git a/macros/symphonymat.sci b/macros/symphonymat.sci index 9dd11a8..2d51b84 100644 --- a/macros/symphonymat.sci +++ b/macros/symphonymat.sci @@ -22,10 +22,10 @@ function [xopt,fopt,status,iter] = symphonymat (varargin) // Parameters // c : a vector of double, contains coefficients of the variables in the objective // intcon : Vector of integer constraints, specified as a vector of positive integers. The values in intcon indicate the components of the decision variable x that are integer-valued. intcon has values from 1 through number of variable. - // A : Linear inequality constraint matrix, specified as a matrix of double. A represents the linear coefficients in the constraints A*x ≤ b. A has the size where columns equals to the number of variables. - // b : Linear inequality constraint vector, specified as a vector of double. b represents the constant vector in the constraints A*x ≤ b. b has size equals to the number of rows in A. - // Aeq : Linear equality constraint matrix, specified as a matrix of double. Aeq represents the linear coefficients in the constraints Aeq*x = beq. Aeq has the size where columns equals to the number of variables. - // beq : Linear equality constraint vector, specified as a vector of double. beq represents the constant vector in the constraints Aeq*x = beq. beq has size equals to the number of rows in Aeq. + // A : a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b. + // b : a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b. + // Aeq : a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq. + // beq : a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq. // lb : Lower bounds, specified as a vector or array of double. lb represents the lower bounds elementwise in lb ≤ x ≤ ub. // ub : Upper bounds, specified as a vector or array of double. ub represents the upper bounds elementwise in lb ≤ x ≤ ub. // options : a list containing the parameters to be set. diff --git a/tests/general_tests/lsqlin/lsqlin_logical2.sce b/tests/general_tests/lsqlin/lsqlin_logical2.sce index 33cdc79..563b5ee 100644 --- a/tests/general_tests/lsqlin/lsqlin_logical2.sce +++ b/tests/general_tests/lsqlin/lsqlin_logical2.sce @@ -1,4 +1,4 @@ -// An example with inequality constraints +// An example with equality and inequality constraints C = [1 1 1; 1 1 0; 0 1 1; diff --git a/tests/general_tests/lsqlin/lsqlin_logical3.sce b/tests/general_tests/lsqlin/lsqlin_logical3.sce index f6a44d6..7d9b37e 100644 --- a/tests/general_tests/lsqlin/lsqlin_logical3.sce +++ b/tests/general_tests/lsqlin/lsqlin_logical3.sce @@ -1,4 +1,4 @@ -// An example with inequality constraints +// An example with equality, inequality constraints and variable bounds C = [1 1 1; 1 1 0; 0 1 1; diff --git a/tests/general_tests/lsqlin/lsqlin_logical4.sce b/tests/general_tests/lsqlin/lsqlin_logical4.sce index 231fe02..d11520b 100644 --- a/tests/general_tests/lsqlin/lsqlin_logical4.sce +++ b/tests/general_tests/lsqlin/lsqlin_logical4.sce @@ -1,4 +1,4 @@ -// An example with inequality constraints +// An example with equality, inequality constraints, variable bounds and initial guess C = [1 1 1; 1 1 0; 0 1 1; diff --git a/tests/general_tests/lsqlin/lsqlin_logical5.sce b/tests/general_tests/lsqlin/lsqlin_logical5.sce index 0802609..983334b 100644 --- a/tests/general_tests/lsqlin/lsqlin_logical5.sce +++ b/tests/general_tests/lsqlin/lsqlin_logical5.sce @@ -1,4 +1,4 @@ -// An example with inequality constraints +// An example with equality, inequality constraints, variable bounds, initial guess and options C = [1 1 1; 1 1 0; 0 1 1; diff --git a/tests/general_tests/lsqnonneg/lsqnonneg_logical2.sce b/tests/general_tests/lsqnonneg/lsqnonneg_logical2.sce index f19ab00..ede09e6 100644 --- a/tests/general_tests/lsqnonneg/lsqnonneg_logical2.sce +++ b/tests/general_tests/lsqnonneg/lsqnonneg_logical2.sce @@ -1,4 +1,4 @@ -// An example with C and d as input +// An example with C, d and options C = [1 1 1; 1 1 0; 0 1 1; diff --git a/tests/general_tests/qpipopt/qpipopt_logical_1.sce b/tests/general_tests/qpipopt/qpipopt_logical_1.sce index 54ba0a0..91da1bb 100644 --- a/tests/general_tests/qpipopt/qpipopt_logical_1.sce +++ b/tests/general_tests/qpipopt/qpipopt_logical_1.sce @@ -1,5 +1,5 @@ //Find x in R^6 such that: -// A simple example with constraints +// An example with constraints, variable bounds, intial guess and param A= [1,-1,1,0,3,1; -1,0,-3,-4,5,6; 2,5,3,0,1,0 diff --git a/tests/general_tests/qpipopt/qpipopt_logical_2.sce b/tests/general_tests/qpipopt/qpipopt_logical_2.sce index d00b07b..027c9c5 100644 --- a/tests/general_tests/qpipopt/qpipopt_logical_2.sce +++ b/tests/general_tests/qpipopt/qpipopt_logical_2.sce @@ -1,44 +1,53 @@ -// A simple example without constraints -A= []; -conLB=[]; -conUB = []; -lb=[]; -ub=[]; -f=[2 -35 -47]'; -H =[5 -2 -1; -2 4 3; -1 3 5]; -nbVar = 3; -nbCon = 0; - +//Find x in R^6 such that: +// An example with constraints, variable bounds and intial guess +A= [1,-1,1,0,3,1; +-1,0,-3,-4,5,6; +2,5,3,0,1,0 +0,1,0,1,2,-1; +-1,0,2,1,1,0]; +conLB=[1;2;3;-%inf;-%inf]; +conUB = [1;2;3;-1;2.5]; +lb=[-1000;-10000; 0; -1000; -1000; -1000]; +ub=[10000; 100; 1.5; 100; 100; 1000]; +//and minimize 0.5*x'*H*x + f'*x with +f=[1; 2; 3; 4; 5; 6]; H=eye(6,6); +nbVar = 6; +nbCon = 5; +x0 = repmat(0,nbVar,1); //Output // //Optimal Solution Found. -// -// lower: [0,0,0] -// upper: [0,0,0] -// constraint: [0x0 constant] +// +// lower: [1x6 constant] +// upper: [1x6 constant] +// constraint: [1x5 constant] // // lambda // -// Iterations: 1 -// ConstrViolation: 0 +// Iterations: 13 +// ConstrViolation: 9.968D-09 // output // // 0 // // exitflag // -// - 249. +// - 14.843248 // // fopt // -// 3. -// 5. -// 7. +// 1.7975426 +// - 0.3381487 +// 0.1633880 +// - 4.9884023 +// 0.6054943 +// - 3.1155623 // // xopt -[xopt,fopt,exitflag,output,lambda]=qpipopt(nbVar,nbCon,H,f,lb,ub,A,conLB,conUB); -disp("xopt",xopt,"fopt",fopt,"exitflag",exitflag,"output",output,"lambda",lambda); +[xopt,fopt,exitflag,output,lambda]=qpipopt(nbVar,nbCon,H,f,lb,ub,A,conLB,conUB,x0); + +disp("xopt",xopt,"fopt",fopt,"exitflag",exitflag,"output",output,"lambda",lambda) diff --git a/tests/general_tests/qpipopt/qpipopt_logical_3.sce b/tests/general_tests/qpipopt/qpipopt_logical_3.sce new file mode 100644 index 0000000..f2e80c9 --- /dev/null +++ b/tests/general_tests/qpipopt/qpipopt_logical_3.sce @@ -0,0 +1,52 @@ +//Find x in R^6 such that: +// An example with constraints and variable bounds +A= [1,-1,1,0,3,1; +-1,0,-3,-4,5,6; +2,5,3,0,1,0 +0,1,0,1,2,-1; +-1,0,2,1,1,0]; +conLB=[1;2;3;-%inf;-%inf]; +conUB = [1;2;3;-1;2.5]; +lb=[-1000;-10000; 0; -1000; -1000; -1000]; +ub=[10000; 100; 1.5; 100; 100; 1000]; +//and minimize 0.5*x'*H*x + f'*x with +f=[1; 2; 3; 4; 5; 6]; H=eye(6,6); +nbVar = 6; +nbCon = 5; + +//Output +// +//Optimal Solution Found. +// +// lower: [1x6 constant] +// upper: [1x6 constant] +// constraint: [1x5 constant] +// +// lambda +// +// Iterations: 13 +// ConstrViolation: 9.968D-09 +// output +// +// 0 +// +// exitflag +// +// - 14.843248 +// +// fopt +// +// 1.7975426 +// - 0.3381487 +// 0.1633880 +// - 4.9884023 +// 0.6054943 +// - 3.1155623 +// +// xopt + +[xopt,fopt,exitflag,output,lambda]=qpipopt(nbVar,nbCon,H,f,lb,ub,A,conLB,conUB); + +disp("xopt",xopt,"fopt",fopt,"exitflag",exitflag,"output",output,"lambda",lambda) + + diff --git a/tests/general_tests/qpipopt/qpipopt_logical_4.sce b/tests/general_tests/qpipopt/qpipopt_logical_4.sce new file mode 100644 index 0000000..28c4f32 --- /dev/null +++ b/tests/general_tests/qpipopt/qpipopt_logical_4.sce @@ -0,0 +1,39 @@ +// A simple example without constraints +A= []; +conLB=[]; +conUB = []; +lb=repmat(0,3,1); +ub=repmat(3,3,1); +f=[2 -35 -47]'; +H =[5 -2 -1; -2 4 3; -1 3 5]; +nbVar = 3; +nbCon = 0; + + +//Output +// +//Optimal Solution Found. +// lambda = +// +// lower: [7.097D-12,3.333D-12,3.333D-12] +// upper: [6.559D-12,16.8,24.4] +// constraint: [0x0 constant] +// output = +// +// Iterations: 8 +// ConstrViolation: 0 +// exitflag = +// +// 0 +// fopt = +// +// - 183.4 +// xopt = +// +// 1.4 +// 3. +// 3. + +[xopt,fopt,exitflag,output,lambda]=qpipopt(nbVar,nbCon,H,f,lb,ub,A,conLB,conUB) + + diff --git a/tests/general_tests/qpipopt/qpipopt_logical_5.sce b/tests/general_tests/qpipopt/qpipopt_logical_5.sce new file mode 100644 index 0000000..f628b86 --- /dev/null +++ b/tests/general_tests/qpipopt/qpipopt_logical_5.sce @@ -0,0 +1,38 @@ +// A simple example without constraints +A= []; +conLB=[]; +conUB = []; +lb=[]; +ub=[]; +f=[2 -35 -47]'; +H =[5 -2 -1; -2 4 3; -1 3 5]; +nbVar = 3; +nbCon = 0; + + +//Output +// +//Optimal Solution Found. +// lambda = +// +// lower: [0,0,0] +// upper: [0,0,0] +// constraint: [0x0 constant] +// output = +// +// Iterations: 1 +// ConstrViolation: 0 +// exitflag = +// +// 0 +// fopt = +// +// - 249. +// xopt = +// +// 3. +// 5. +// 7. + +[xopt,fopt,exitflag,output,lambda]=qpipopt(nbVar,nbCon,H,f,lb,ub,A,conLB,conUB) + diff --git a/tests/general_tests/qpipoptmat/qpipoptmat_logical2.sce b/tests/general_tests/qpipoptmat/qpipoptmat_logical2.sce index 137c7bb..fd5714d 100644 --- a/tests/general_tests/qpipoptmat/qpipoptmat_logical2.sce +++ b/tests/general_tests/qpipoptmat/qpipoptmat_logical2.sce @@ -1,5 +1,5 @@ //Find x in R^6 such that: -// A simple example with constraints +// An example with equality, inequality constraints, variable bounds, intial guess and param Aeq= [1,-1,1,0,3,1; -1,0,-3,-4,5,6; diff --git a/tests/general_tests/qpipoptmat/qpipoptmat_logical3.sce b/tests/general_tests/qpipoptmat/qpipoptmat_logical3.sce index 3565d34..64eca68 100644 --- a/tests/general_tests/qpipoptmat/qpipoptmat_logical3.sce +++ b/tests/general_tests/qpipoptmat/qpipoptmat_logical3.sce @@ -1,5 +1,5 @@ //Find x in R^6 such that: -// A simple example with constraints +// An example with equality, inequality constraints, variable bounds and intial guess Aeq= [1,-1,1,0,3,1; -1,0,-3,-4,5,6; diff --git a/tests/general_tests/qpipoptmat/qpipoptmat_logical4.sce b/tests/general_tests/qpipoptmat/qpipoptmat_logical4.sce index bad5b8c..0d74230 100644 --- a/tests/general_tests/qpipoptmat/qpipoptmat_logical4.sce +++ b/tests/general_tests/qpipoptmat/qpipoptmat_logical4.sce @@ -1,5 +1,5 @@ //Find x in R^6 such that: -// A simple example with constraints +// An example with equality and inequality constraints Aeq= [1,-1,1,0,3,1; -1,0,-3,-4,5,6; diff --git a/tests/general_tests/qpipoptmat/qpipoptmat_logical5.sce b/tests/general_tests/qpipoptmat/qpipoptmat_logical5.sce index 2c78091..0a88414 100644 --- a/tests/general_tests/qpipoptmat/qpipoptmat_logical5.sce +++ b/tests/general_tests/qpipoptmat/qpipoptmat_logical5.sce @@ -1,15 +1,9 @@ //Find x in R^6 such that: -// A simple example with constraints +// A simple example with inequality constraints -Aeq= [1,-1,1,0,3,1; --1,0,-3,-4,5,6; -2,5,3,0,1,0]; -beq=[1; 2; 3]; A= [0,1,0,1,2,-1; -1,0,2,1,1,0]; b = [-1; 2.5]; -lb=[-1000; -10000; 0; -1000; -1000; -1000]; -ub=[10000; 100; 1.5; 100; 100; 1000]; param = list("MaxIter", 300, "CpuTime",100); //and minimize 0.5*x'*H*x + f'*x with f=[1; 2; 3; 4; 5; 6]; H=eye(6,6); |