diff options
Diffstat (limited to 'macros/matrix_linprog.sci')
| -rw-r--r--[-rwxr-xr-x] | macros/matrix_linprog.sci | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/macros/matrix_linprog.sci b/macros/matrix_linprog.sci index 667fd3d..469066c 100755..100644 --- a/macros/matrix_linprog.sci +++ b/macros/matrix_linprog.sci @@ -109,7 +109,7 @@ function [xopt,fopt,exitflag,output,lambda] = matrix_linprog (varargin) select convstr(param(2*i-1),'l') case "maxiter" then - options(2) = param(2*i); + options(2*i) = param(2*i); else errmsg = msprintf(gettext("%s: Unrecognized parameter name ''%s''."), "linprog", param(2*i-1)); error(errmsg) @@ -205,14 +205,14 @@ function [xopt,fopt,exitflag,output,lambda] = matrix_linprog (varargin) "constrviolation" , []); output.Iterations = iter; - output.constrviolation = max([0;norm(Aeq*xopt-beq, 'inf');(lb-xopt);(xopt-ub);(A*xopt-b)]); + output.constrviolation = []//max([0;norm(Aeq*xopt-beq, 'inf');(lb-xopt);(xopt-ub);(A*xopt-b)]); lambda = struct("lower" , [], .. "ineqlin" , [], .. "eqlin" , []); - lambda.lower = Zl; - lambda.eqlin = dual(1:nbConEq); - lambda.ineqlin = dual(nbConEq+1:nbCon); + lambda.lower = []//Zl; + lambda.eqlin = []//dual(1:nbConEq); + lambda.ineqlin = []//dual(nbConEq+1:nbCon); select status case 0 then |