diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/Checkdims.bin | bin | 8188 -> 8188 bytes | |||
| -rw-r--r-- | macros/Checklhs.bin | bin | 10312 -> 10312 bytes | |||
| -rw-r--r-- | macros/Checkrhs.bin | bin | 12852 -> 12852 bytes | |||
| -rw-r--r-- | macros/Checktype.bin | bin | 9156 -> 9156 bytes | |||
| -rw-r--r-- | macros/Checkvector.bin | bin | 9696 -> 9696 bytes | |||
| -rw-r--r-- | macros/fgoalattain.bin | bin | 76660 -> 76660 bytes | |||
| -rw-r--r-- | macros/fminbnd.bin | bin | 64156 -> 64156 bytes | |||
| -rw-r--r-- | macros/fmincon.bin | bin | 156076 -> 156144 bytes | |||
| -rw-r--r-- | macros/fmincon.sci | 4 | ||||
| -rw-r--r-- | macros/fminimax.bin | bin | 86512 -> 86532 bytes | |||
| -rw-r--r-- | macros/fminimax.sci | 10 | ||||
| -rw-r--r-- | macros/fminunc.bin | bin | 69644 -> 69644 bytes | |||
| -rw-r--r-- | macros/lib | bin | 912 -> 996 bytes | |||
| -rw-r--r-- | macros/linprog.bin | bin | 30012 -> 30012 bytes | |||
| -rw-r--r-- | macros/lsqlin.bin | bin | 64528 -> 64528 bytes | |||
| -rw-r--r-- | macros/lsqnonneg.bin | bin | 33808 -> 33808 bytes | |||
| -rw-r--r-- | macros/matrix_linprog.bin | bin | 30584 -> 30584 bytes | |||
| -rw-r--r-- | macros/mps_linprog.bin | bin | 10064 -> 10064 bytes | |||
| -rw-r--r-- | macros/names | 1 | ||||
| -rw-r--r-- | macros/qpipopt.bin | bin | 63432 -> 63432 bytes | |||
| -rw-r--r-- | macros/qpipoptmat.bin | bin | 65684 -> 65684 bytes | |||
| -rw-r--r-- | macros/setOptions.bin | bin | 3040 -> 3040 bytes | |||
| -rw-r--r-- | macros/symphony_call.bin | bin | 4580 -> 4580 bytes |
23 files changed, 8 insertions, 7 deletions
diff --git a/macros/Checkdims.bin b/macros/Checkdims.bin Binary files differindex 8df0367..40e385a 100644 --- a/macros/Checkdims.bin +++ b/macros/Checkdims.bin diff --git a/macros/Checklhs.bin b/macros/Checklhs.bin Binary files differindex 34561dc..7156107 100644 --- a/macros/Checklhs.bin +++ b/macros/Checklhs.bin diff --git a/macros/Checkrhs.bin b/macros/Checkrhs.bin Binary files differindex 2ec00b7..2c45876 100644 --- a/macros/Checkrhs.bin +++ b/macros/Checkrhs.bin diff --git a/macros/Checktype.bin b/macros/Checktype.bin Binary files differindex a43e55c..bbe1585 100644 --- a/macros/Checktype.bin +++ b/macros/Checktype.bin diff --git a/macros/Checkvector.bin b/macros/Checkvector.bin Binary files differindex 9a6bfdc..dfe03ab 100644 --- a/macros/Checkvector.bin +++ b/macros/Checkvector.bin diff --git a/macros/fgoalattain.bin b/macros/fgoalattain.bin Binary files differindex c329f4a..faa0821 100644 --- a/macros/fgoalattain.bin +++ b/macros/fgoalattain.bin diff --git a/macros/fminbnd.bin b/macros/fminbnd.bin Binary files differindex c9ddb2e..24cd387 100644 --- a/macros/fminbnd.bin +++ b/macros/fminbnd.bin diff --git a/macros/fmincon.bin b/macros/fmincon.bin Binary files differindex dacdfd9..dfd67b4 100644 --- a/macros/fmincon.bin +++ b/macros/fmincon.bin diff --git a/macros/fmincon.sci b/macros/fmincon.sci index a92faf1..3f65464 100644 --- a/macros/fmincon.sci +++ b/macros/fmincon.sci @@ -250,7 +250,9 @@ function [xopt,fopt,exitflag,output,lambda,gradient,hessian] = fmincon (varargin // endfunction // //Hessian of the Lagrange Function // function y= lHess(x,obj,lambda) - // y= obj*[0,1,0;1,0,1;0,1,0] + lambda(1)*[2,0,0;0,0,0;0,0,0] + lambda(2)*[2,0,0;0,2,0;0,0,0] +lambda(3)*[0,0,0;0,0,0;0,0,2] + lambda(4)*[6*x(1 ),0,0;0,0,0;0,0,0] + lambda(5)*[0,0,0;0,2,0;0,0,2]; + // y= obj*[0,1,0;1,0,1;0,1,0] + lambda(1)*[2,0,0;0,0,0;0,0,0] + .. + // lambda(2)*[2,0,0;0,2,0;0,0,0] +lambda(3)*[0,0,0;0,0,0;0,0,2] + .. + // lambda(4)*[6*x(1),0,0;0,0,0;0,0,0] + lambda(5)*[0,0,0;0,2,0;0,0,2]; // endfunction // //Gradient of Non-Linear Constraints // function [cg,ceqg] = cGrad(x) diff --git a/macros/fminimax.bin b/macros/fminimax.bin Binary files differindex 9704302..c023720 100644 --- a/macros/fminimax.bin +++ b/macros/fminimax.bin diff --git a/macros/fminimax.sci b/macros/fminimax.sci index c775b1b..b649640 100644 --- a/macros/fminimax.sci +++ b/macros/fminimax.sci @@ -19,11 +19,11 @@ function [x,fval,maxfval,exitflag,output,lambda] = fminimax(varargin) // xopt = fminimax(fun,x0,A,b,Aeq,beq,lb,ub) // xopt = fminimax(fun,x0,A,b,Aeq,beq,lb,ub,nonlinfun) // xopt = fminimax(fun,x0,A,b,Aeq,beq,lb,ub,nonlinfun,options) - // [xopt, fval] = fmincon(.....) - // [xopt, fval, maxfval]= fmincon(.....) - // [xopt, fval, maxfval, exitflag]= fmincon(.....) - // [xopt, fval, maxfval, exitflag, output]= fmincon(.....) - // [xopt, fval, maxfval, exitflag, output, lambda]= fmincon(.....) + // [xopt, fval] = fminimax(.....) + // [xopt, fval, maxfval]= fminimax(.....) + // [xopt, fval, maxfval, exitflag]= fminimax(.....) + // [xopt, fval, maxfval, exitflag, output]= fminimax(.....) + // [xopt, fval, maxfval, exitflag, output, lambda]= fminimax(.....) // // Parameters // fun: The function to be minimized. fun is a function that accepts a vector x and returns a vector F, the objective functions evaluated at x. diff --git a/macros/fminunc.bin b/macros/fminunc.bin Binary files differBinary files differindex ab53755..b5dee4a 100644 --- a/macros/fminunc.bin +++ b/macros/fminunc.bin diff --git a/macros/linprog.bin b/macros/linprog.bin Binary files differindex 7ba3ab3..1d3a5aa 100644 --- a/macros/linprog.bin +++ b/macros/linprog.bin diff --git a/macros/lsqlin.bin b/macros/lsqlin.bin Binary files differindex 56c1e69..7baf7be 100644 --- a/macros/lsqlin.bin +++ b/macros/lsqlin.bin diff --git a/macros/lsqnonneg.bin b/macros/lsqnonneg.bin Binary files differindex 17b5808..32620d0 100644 --- a/macros/lsqnonneg.bin +++ b/macros/lsqnonneg.bin diff --git a/macros/matrix_linprog.bin b/macros/matrix_linprog.bin Binary files differindex 2b4af21..a51bc14 100644 --- a/macros/matrix_linprog.bin +++ b/macros/matrix_linprog.bin diff --git a/macros/mps_linprog.bin b/macros/mps_linprog.bin Binary files differindex f45ed06..c0d2e3e 100644 --- a/macros/mps_linprog.bin +++ b/macros/mps_linprog.bin diff --git a/macros/names b/macros/names index 2f20196..21c7d4e 100644 --- a/macros/names +++ b/macros/names @@ -9,7 +9,6 @@ fmincon fminimax fminunc fseminf -intlinprog linprog lsqlin lsqnonlin diff --git a/macros/qpipopt.bin b/macros/qpipopt.bin Binary files differindex d33679e..e2ba3de 100644 --- a/macros/qpipopt.bin +++ b/macros/qpipopt.bin diff --git a/macros/qpipoptmat.bin b/macros/qpipoptmat.bin Binary files differindex 0bd1c14..b9c741f 100644 --- a/macros/qpipoptmat.bin +++ b/macros/qpipoptmat.bin diff --git a/macros/setOptions.bin b/macros/setOptions.bin Binary files differindex 8953829..8d23e73 100644 --- a/macros/setOptions.bin +++ b/macros/setOptions.bin diff --git a/macros/symphony_call.bin b/macros/symphony_call.bin Binary files differindex 57ce782..a883f05 100644 --- a/macros/symphony_call.bin +++ b/macros/symphony_call.bin |