diff options
author | harpreet | 2016-07-01 00:11:55 +0530 |
---|---|---|
committer | harpreet | 2016-07-01 00:11:55 +0530 |
commit | 89b96cb79cbe75ba8c1afea61b3caca37a083f62 (patch) | |
tree | 1b879fb0dce2406c1c49bf5bdabcedfb12ff020c /macros | |
parent | 10e2e4d8b4a7592a8631ddac8e8d1664d6f0b9e3 (diff) | |
download | FOSSEE-Optimization-toolbox-89b96cb79cbe75ba8c1afea61b3caca37a083f62.tar.gz FOSSEE-Optimization-toolbox-89b96cb79cbe75ba8c1afea61b3caca37a083f62.tar.bz2 FOSSEE-Optimization-toolbox-89b96cb79cbe75ba8c1afea61b3caca37a083f62.zip |
Windows Included
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 | 9772 -> 9696 bytes | |||
-rw-r--r-- | macros/Checkvector.sci | 2 | ||||
-rw-r--r-- | macros/cleanmacros.sce | 20 | ||||
-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 -> 156076 bytes | |||
-rw-r--r-- | macros/fminimax.bin | bin | 86532 -> 86512 bytes | |||
-rw-r--r-- | macros/fminimax.sci | 10 | ||||
-rw-r--r-- | macros/fminunc.bin | bin | 69648 -> 69644 bytes | |||
-rw-r--r-- | macros/fminunc.sci | 2 | ||||
-rw-r--r-- | macros/lib | bin | 888 -> 912 bytes | |||
-rw-r--r-- | macros/linprog.bin | bin | 30012 -> 30012 bytes | |||
-rw-r--r-- | macros/lsqlin.bin | bin | 64424 -> 64528 bytes | |||
-rw-r--r-- | macros/lsqlin.sci | 4 | ||||
-rw-r--r-- | macros/lsqnonneg.bin | bin | 33704 -> 33808 bytes | |||
-rw-r--r-- | macros/lsqnonneg.sci | 4 | ||||
-rw-r--r-- | macros/matrix_linprog.bin | bin | 31048 -> 30584 bytes | |||
-rw-r--r--[-rwxr-xr-x] | macros/matrix_linprog.sci | 10 | ||||
-rw-r--r-- | macros/mps_linprog.bin | bin | 10012 -> 10064 bytes | |||
-rw-r--r-- | macros/mps_linprog.sci | 2 | ||||
-rw-r--r-- | macros/names | 1 | ||||
-rw-r--r-- | macros/qpipopt.bin | bin | 63328 -> 63432 bytes | |||
-rw-r--r-- | macros/qpipopt.sci | 4 | ||||
-rw-r--r-- | macros/qpipoptmat.bin | bin | 65580 -> 65684 bytes | |||
-rw-r--r-- | macros/qpipoptmat.sci | 4 | ||||
-rw-r--r-- | macros/setOptions.bin | bin | 3040 -> 3040 bytes | |||
-rw-r--r-- | macros/symphony.bin | bin | 62044 -> 62048 bytes | |||
-rw-r--r-- | macros/symphony.sci | 2 | ||||
-rw-r--r-- | macros/symphony_call.bin | bin | 4592 -> 4580 bytes | |||
-rw-r--r-- | macros/symphony_call.sci | 5 | ||||
-rw-r--r-- | macros/symphonymat.bin | bin | 65436 -> 65440 bytes | |||
-rw-r--r-- | macros/symphonymat.sci | 2 |
36 files changed, 45 insertions, 27 deletions
diff --git a/macros/Checkdims.bin b/macros/Checkdims.bin Binary files differindex 40e385a..8df0367 100644 --- a/macros/Checkdims.bin +++ b/macros/Checkdims.bin diff --git a/macros/Checklhs.bin b/macros/Checklhs.bin Binary files differindex 7156107..34561dc 100644 --- a/macros/Checklhs.bin +++ b/macros/Checklhs.bin diff --git a/macros/Checkrhs.bin b/macros/Checkrhs.bin Binary files differindex 2c45876..2ec00b7 100644 --- a/macros/Checkrhs.bin +++ b/macros/Checkrhs.bin diff --git a/macros/Checktype.bin b/macros/Checktype.bin Binary files differindex bbe1585..a43e55c 100644 --- a/macros/Checktype.bin +++ b/macros/Checktype.bin diff --git a/macros/Checkvector.bin b/macros/Checkvector.bin Binary files differindex 710f1ff..9a6bfdc 100644 --- a/macros/Checkvector.bin +++ b/macros/Checkvector.bin diff --git a/macros/Checkvector.sci b/macros/Checkvector.sci index f24a92d..76bdcc6 100644 --- a/macros/Checkvector.sci +++ b/macros/Checkvector.sci @@ -49,7 +49,7 @@ function errmsg = Checkvector ( funname , var , varname , ivar , nbval ) ncols = size(var,"c") if ( nrows <> 1 & ncols <> 1 ) then strcomp = strcat(string(size(var))," ") - errmsg = msprintf(gettext("%s: Expected a vector matrix for input argument %s at input #%d, but current dimensions are [%s] instead."), funname, varname , ivar , strcomp ); + errmsg = msprintf(gettext("%s: Expected a vector matrix for input argument %s at input #%d, but got [%s] instead."), funname, varname , ivar , strcomp ); error(errmsg) end if ( ( nrows == 1 & ncols <> nbval ) | ( ncols == 1 & nrows <> nbval ) ) then diff --git a/macros/cleanmacros.sce b/macros/cleanmacros.sce new file mode 100644 index 0000000..56d0240 --- /dev/null +++ b/macros/cleanmacros.sce @@ -0,0 +1,20 @@ +// ====================================================================
+// This file is released under the 3-clause BSD license. See COPYING-BSD.
+// ====================================================================
+function cleanmacros()
+
+ libpath = get_absolute_file_path("cleanmacros.sce");
+
+ binfiles = ls(libpath+"/*.bin");
+ for i = 1:size(binfiles,"*")
+ mdelete(binfiles(i));
+ end
+
+ mdelete(libpath+"/names");
+ mdelete(libpath+"/lib");
+endfunction
+
+cleanmacros();
+clear cleanmacros; // remove cleanmacros on stack
+
+// ====================================================================
diff --git a/macros/fgoalattain.bin b/macros/fgoalattain.bin Binary files differindex faa0821..c329f4a 100644 --- a/macros/fgoalattain.bin +++ b/macros/fgoalattain.bin diff --git a/macros/fminbnd.bin b/macros/fminbnd.bin Binary files differindex 24cd387..c9ddb2e 100644 --- a/macros/fminbnd.bin +++ b/macros/fminbnd.bin diff --git a/macros/fmincon.bin b/macros/fmincon.bin Binary files differindex ef503f1..dacdfd9 100644 --- a/macros/fmincon.bin +++ b/macros/fmincon.bin diff --git a/macros/fminimax.bin b/macros/fminimax.bin Binary files differindex c023720..9704302 100644 --- a/macros/fminimax.bin +++ b/macros/fminimax.bin diff --git a/macros/fminimax.sci b/macros/fminimax.sci index b649640..c775b1b 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] = fminimax(.....) - // [xopt, fval, maxfval]= fminimax(.....) - // [xopt, fval, maxfval, exitflag]= fminimax(.....) - // [xopt, fval, maxfval, exitflag, output]= fminimax(.....) - // [xopt, fval, maxfval, exitflag, output, lambda]= fminimax(.....) + // [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(.....) // // 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 differindex 0160e5f..ab53755 100644 --- a/macros/fminunc.bin +++ b/macros/fminunc.bin diff --git a/macros/fminunc.sci b/macros/fminunc.sci index a24f1f9..38b76ec 100644 --- a/macros/fminunc.sci +++ b/macros/fminunc.sci @@ -280,7 +280,7 @@ function [xopt,fopt,exitflag,output,gradient,hessian] = fminunc (varargin) else options(4) = param(2*i); //Setting the maximum CPU time as per user entry end - case "gradient" then + case "gradobj" then if (type(param(2*i))==10) then if (convstr(param(2*i))=="off") then flag1 =0; Binary files differdiff --git a/macros/linprog.bin b/macros/linprog.bin Binary files differindex 1d3a5aa..7ba3ab3 100644 --- a/macros/linprog.bin +++ b/macros/linprog.bin diff --git a/macros/lsqlin.bin b/macros/lsqlin.bin Binary files differindex 4e07959..56c1e69 100644 --- a/macros/lsqlin.bin +++ b/macros/lsqlin.bin diff --git a/macros/lsqlin.sci b/macros/lsqlin.sci index f140772..f236c0d 100644 --- a/macros/lsqlin.sci +++ b/macros/lsqlin.sci @@ -230,9 +230,9 @@ function [xopt,resnorm,residual,exitflag,output,lambda] = lsqlin (varargin) select convstr(param(2*i-1),'l') case "maxiter" then - options(2) = param(2*i); + options(2*i) = param(2*i); case "cputime" then - options(4) = param(2*i); + options(2*i) = param(2*i); else errmsg = msprintf(gettext("%s: Unrecognized parameter name ''%s''."), "lsqlin", param(2*i-1)); error(errmsg) diff --git a/macros/lsqnonneg.bin b/macros/lsqnonneg.bin Binary files differindex 01a1a7d..17b5808 100644 --- a/macros/lsqnonneg.bin +++ b/macros/lsqnonneg.bin diff --git a/macros/lsqnonneg.sci b/macros/lsqnonneg.sci index 62ae37f..a60d417 100644 --- a/macros/lsqnonneg.sci +++ b/macros/lsqnonneg.sci @@ -140,9 +140,9 @@ function [xopt,resnorm,residual,exitflag,output,lambda] = lsqnonneg (varargin) select convstr(param(2*i-1),'l') case "maxiter" then - options(2) = param(2*i); + options(2*i) = param(2*i); case "cputime" then - options(4) = param(2*i); + options(2*i) = param(2*i); else errmsg = msprintf(gettext("%s: Unrecognized parameter name ''%s''."), "lsqlin", param(2*i-1)); error(errmsg) diff --git a/macros/matrix_linprog.bin b/macros/matrix_linprog.bin Binary files differindex a490aaf..2b4af21 100644 --- a/macros/matrix_linprog.bin +++ b/macros/matrix_linprog.bin 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 diff --git a/macros/mps_linprog.bin b/macros/mps_linprog.bin Binary files differindex 2bc6eca..f45ed06 100644 --- a/macros/mps_linprog.bin +++ b/macros/mps_linprog.bin diff --git a/macros/mps_linprog.sci b/macros/mps_linprog.sci index b1be48a..aa61d02 100644 --- a/macros/mps_linprog.sci +++ b/macros/mps_linprog.sci @@ -51,7 +51,7 @@ function [xopt,fopt,exitflag,output,lambda] =mps_linprog(varargin) for i = 1:(size(param))/2 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) diff --git a/macros/names b/macros/names index 21c7d4e..2f20196 100644 --- a/macros/names +++ b/macros/names @@ -9,6 +9,7 @@ fmincon fminimax fminunc fseminf +intlinprog linprog lsqlin lsqnonlin diff --git a/macros/qpipopt.bin b/macros/qpipopt.bin Binary files differindex f6de035..d33679e 100644 --- a/macros/qpipopt.bin +++ b/macros/qpipopt.bin diff --git a/macros/qpipopt.sci b/macros/qpipopt.sci index 1696967..c900f0c 100644 --- a/macros/qpipopt.sci +++ b/macros/qpipopt.sci @@ -218,9 +218,9 @@ function [xopt,fopt,exitflag,output,lambda] = qpipopt (varargin) select convstr(param(2*i-1),'l') case "maxiter" then - options(2) = param(2*i); + options(2*i) = param(2*i); case "cputime" then - options(4) = param(2*i); + options(2*i) = param(2*i); else errmsg = msprintf(gettext("%s: Unrecognized parameter name ''%s''."), "lsqlin", param(2*i-1)); error(errmsg) diff --git a/macros/qpipoptmat.bin b/macros/qpipoptmat.bin Binary files differindex 3e9d8f6..0bd1c14 100644 --- a/macros/qpipoptmat.bin +++ b/macros/qpipoptmat.bin diff --git a/macros/qpipoptmat.sci b/macros/qpipoptmat.sci index 5a210a1..41ec8e7 100644 --- a/macros/qpipoptmat.sci +++ b/macros/qpipoptmat.sci @@ -230,9 +230,9 @@ function [xopt,fopt,exitflag,output,lambda] = qpipoptmat (varargin) select convstr(param(2*i-1),'l') case "maxiter" then - options(2) = param(2*i); + options(2*i) = param(2*i); case "cputime" then - options(4) = param(2*i); + options(2*i) = param(2*i); else errmsg = msprintf(gettext("%s: Unrecognized parameter name ''%s''."), "lsqlin", param(2*i-1)); error(errmsg) diff --git a/macros/setOptions.bin b/macros/setOptions.bin Binary files differindex 8d23e73..8953829 100644 --- a/macros/setOptions.bin +++ b/macros/setOptions.bin diff --git a/macros/symphony.bin b/macros/symphony.bin Binary files differindex 2c3a43a..3dacf06 100644 --- a/macros/symphony.bin +++ b/macros/symphony.bin diff --git a/macros/symphony.sci b/macros/symphony.sci index 111f84c..7efdeeb 100644 --- a/macros/symphony.sci +++ b/macros/symphony.sci @@ -170,7 +170,7 @@ function [xopt,fopt,status,output] = symphony (varargin) // 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 1 1 0 0 1 0 .. // 0 1 0 1 0 0 1 0 0 1 0 1 0 0 0 0 0 1 1 0 0 0 0 0 1 1 0 0 1 0 0 1 0] // // Optimal value - // fopt = [ 24381 ] + // fopt = [ -24381 ] // // Calling Symphony // [x,f,status,output] = symphony(nbVar,nbCon,c,isInt,lb,ub,A,conLB,conUB,-1,options); // Authors diff --git a/macros/symphony_call.bin b/macros/symphony_call.bin Binary files differindex 5e0d5e1..57ce782 100644 --- a/macros/symphony_call.bin +++ b/macros/symphony_call.bin diff --git a/macros/symphony_call.sci b/macros/symphony_call.sci index 80b22d0..5d49a6f 100644 --- a/macros/symphony_call.sci +++ b/macros/symphony_call.sci @@ -41,11 +41,8 @@ function [xopt,fopt,status,output] = symphony_call(nbVar,nbCon,objCoef,isInt,lb, fopt = sym_getObjVal(); end - status = sym_getStatus(); - - output = struct("Iterations" , []); - + output = struct("Iterations", []); output.Iterations = sym_getIterCount(); diff --git a/macros/symphonymat.bin b/macros/symphonymat.bin Binary files differindex 7dffa2f..9d7271a 100644 --- a/macros/symphonymat.bin +++ b/macros/symphonymat.bin diff --git a/macros/symphonymat.sci b/macros/symphonymat.sci index 2016f00..76b38bf 100644 --- a/macros/symphonymat.sci +++ b/macros/symphonymat.sci @@ -162,7 +162,7 @@ function [xopt,fopt,status,iter] = symphonymat (varargin) // 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 1 1 .. // 0 0 1 0 0 1 0 1 0 0 1 0 0 1 0 1 0 0 0 0 0 1 1 0 0 0 0 0 1 1 0 0 1 0 0 1 0] // // Optimal value - // fopt = [ 24381 ] + // fopt = [ -24381 ] // // Calling Symphony // [x,f,status,output] = symphonymat(c,intcon,A,b,[],[],lb,ub,options); // Authors |