diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/linprog.bin | bin | 29644 -> 30012 bytes | |||
| -rw-r--r-- | macros/linprog.sci | 1 | ||||
| -rw-r--r-- | macros/matrix_linprog.bin | bin | 31128 -> 31100 bytes | |||
| -rwxr-xr-x | macros/matrix_linprog.sci | 4 |
4 files changed, 3 insertions, 2 deletions
diff --git a/macros/linprog.bin b/macros/linprog.bin Binary files differindex 12a9f7d..1d3a5aa 100644 --- a/macros/linprog.bin +++ b/macros/linprog.bin diff --git a/macros/linprog.sci b/macros/linprog.sci index 5b12241..c7df21b 100644 --- a/macros/linprog.sci +++ b/macros/linprog.sci @@ -84,6 +84,7 @@ function [xopt,fopt,exitflag,output,lambda] = linprog (varargin) // of optimization. In the current version the values are returned only when the the solution is optimal. // It has type "struct" and contains the following fields. // <itemizedlist> + // <listitem>lambda.lower: The Lagrange multipliers for variable lower bounds.</listitem> // <listitem>lambda.eqlin: The Lagrange multipliers for the linear equality constraints.</listitem> // <listitem>lambda.ineqlin: The Lagrange multipliers for the linear inequality constraints.</listitem> // </itemizedlist> diff --git a/macros/matrix_linprog.bin b/macros/matrix_linprog.bin Binary files differindex ac4d8d9..e3a9db3 100644 --- a/macros/matrix_linprog.bin +++ b/macros/matrix_linprog.bin diff --git a/macros/matrix_linprog.sci b/macros/matrix_linprog.sci index c1f53a0..daf4168 100755 --- a/macros/matrix_linprog.sci +++ b/macros/matrix_linprog.sci @@ -206,11 +206,11 @@ function [xopt,fopt,exitflag,output,lambda] = matrix_linprog (varargin) output.Iterations = iter; output.constrviolation = max([0;norm(Aeq*xopt-beq, 'inf');(lb-xopt);(xopt-ub);(A*xopt-b)]); - lambda = struct("reduced_cost" , [], .. + lambda = struct("lower" , [], .. "ineqlin" , [], .. "eqlin" , []); - lambda.reduced_cost = Zl; + lambda.lower = Zl; lambda.eqlin = dual(1:nbConEq); lambda.ineqlin = dual(nbConEq+1:nbCon); select status |