diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/Checkdims.bin | bin | 8188 -> 0 bytes | |||
| -rw-r--r-- | macros/Checklhs.bin | bin | 10312 -> 0 bytes | |||
| -rw-r--r-- | macros/Checkrhs.bin | bin | 12852 -> 0 bytes | |||
| -rw-r--r-- | macros/Checktype.bin | bin | 9156 -> 0 bytes | |||
| -rw-r--r-- | macros/Checkvector.bin | bin | 9696 -> 0 bytes | |||
| -rw-r--r-- | macros/cleanmacros.sce | 20 | ||||
| -rw-r--r-- | macros/fgoalattain.bin | bin | 76912 -> 0 bytes | |||
| -rw-r--r-- | macros/fgoalattain.sci | 1 | ||||
| -rw-r--r-- | macros/fminbnd.bin | bin | 54876 -> 0 bytes | |||
| -rw-r--r-- | macros/fmincon.bin | bin | 149512 -> 0 bytes | |||
| -rw-r--r-- | macros/fmincon.sci | 12 | ||||
| -rw-r--r-- | macros/fminimax.bin | bin | 86512 -> 0 bytes | |||
| -rw-r--r-- | macros/fminunc.bin | bin | 60896 -> 0 bytes | |||
| -rw-r--r-- | macros/lib | bin | 840 -> 0 bytes | |||
| -rw-r--r-- | macros/linprog.bin | bin | 30012 -> 0 bytes | |||
| -rw-r--r-- | macros/lsqlin.bin | bin | 64528 -> 0 bytes | |||
| -rw-r--r-- | macros/lsqnonneg.bin | bin | 33808 -> 0 bytes | |||
| -rw-r--r-- | macros/matrix_linprog.bin | bin | 31100 -> 0 bytes | |||
| -rw-r--r-- | macros/mps_linprog.bin | bin | 10064 -> 0 bytes | |||
| -rw-r--r-- | macros/names | 21 | ||||
| -rw-r--r-- | macros/qpipopt.bin | bin | 63432 -> 0 bytes | |||
| -rw-r--r-- | macros/qpipoptmat.bin | bin | 66084 -> 0 bytes | |||
| -rw-r--r-- | macros/qpipoptmat.sci | 15 | ||||
| -rw-r--r-- | macros/setOptions.bin | bin | 3040 -> 0 bytes | |||
| -rw-r--r-- | macros/symphony.bin | bin | 62044 -> 0 bytes | |||
| -rw-r--r-- | macros/symphony_call.bin | bin | 4592 -> 0 bytes | |||
| -rw-r--r-- | macros/symphonymat.bin | bin | 65436 -> 0 bytes |
27 files changed, 27 insertions, 42 deletions
diff --git a/macros/Checkdims.bin b/macros/Checkdims.bin Binary files differdeleted file mode 100644 index 40e385a..0000000 --- a/macros/Checkdims.bin +++ /dev/null diff --git a/macros/Checklhs.bin b/macros/Checklhs.bin Binary files differdeleted file mode 100644 index 7156107..0000000 --- a/macros/Checklhs.bin +++ /dev/null diff --git a/macros/Checkrhs.bin b/macros/Checkrhs.bin Binary files differdeleted file mode 100644 index 2c45876..0000000 --- a/macros/Checkrhs.bin +++ /dev/null diff --git a/macros/Checktype.bin b/macros/Checktype.bin Binary files differdeleted file mode 100644 index bbe1585..0000000 --- a/macros/Checktype.bin +++ /dev/null diff --git a/macros/Checkvector.bin b/macros/Checkvector.bin Binary files differdeleted file mode 100644 index dfe03ab..0000000 --- a/macros/Checkvector.bin +++ /dev/null diff --git a/macros/cleanmacros.sce b/macros/cleanmacros.sce new file mode 100644 index 0000000..a6428b2 --- /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 differdeleted file mode 100644 index 4889336..0000000 --- a/macros/fgoalattain.bin +++ /dev/null diff --git a/macros/fgoalattain.sci b/macros/fgoalattain.sci index 41c0fcc..137b4e3 100644 --- a/macros/fgoalattain.sci +++ b/macros/fgoalattain.sci @@ -176,7 +176,6 @@ function [x,fval,attainfactor,exitflag,output,lambda] = fgoalattain(varargin) Checktype("fgoalattain", gattainStartpoint, "x0", 2, "constant") gattainNumvar = size(gattainStartpoint,"*") - Checkvector("fgoalattain", gattainStartpoint, "x0", 2, gattainNumvar) gattainStartpoint = gattainStartpoint(:) // initialisation of goal diff --git a/macros/fminbnd.bin b/macros/fminbnd.bin Binary files differdeleted file mode 100644 index 97b00fc..0000000 --- a/macros/fminbnd.bin +++ /dev/null diff --git a/macros/fmincon.bin b/macros/fmincon.bin Binary files differdeleted file mode 100644 index e1785a4..0000000 --- a/macros/fmincon.bin +++ /dev/null diff --git a/macros/fmincon.sci b/macros/fmincon.sci index 49adec5..2393649 100644 --- a/macros/fmincon.sci +++ b/macros/fmincon.sci @@ -268,15 +268,10 @@ function [xopt,fopt,exitflag,output,lambda,gradient,hessian] = fmincon (varargin [lhs , rhs] = argn(); //To check the number of arguments given by the user - if ( rhs<4 | rhs>13 ) then - errmsg = msprintf(gettext("%s: Unexpected number of input arguments : %d provided while it should be 4,6,8,9,10,11,12,13"), "fmincon", rhs); + if ( rhs<4 | rhs==5 | rhs==7 | rhs>10 ) then + errmsg = msprintf(gettext("%s: Unexpected number of input arguments : %d provided while it should be 4,6,8,9,10"), "fmincon", rhs); error(errmsg) end - - if (rhs==5 | rhs==7) then - errmsg = msprintf(gettext("%s: Unexpected number of input arguments : %d provided while it should be 4,6,8,9,10,11,12,13"), "fmincon", rhs); - error(errmsg) - end //Storing the Input Parameters fun = varargin(1); @@ -862,7 +857,7 @@ function [xopt,fopt,exitflag,output,lambda,gradient,hessian] = fmincon (varargin lambda.ineqlin (j) = lambda1(i) j= j+1; end - lambda.ineqlin = lambda.ineqlin' + lambda.ineqlin = lambda.ineqlin'; end //Converting hessian of order (1 x (numberOfVariables)^2) received from Ipopt to order (numberOfVariables x numberOfVariables) @@ -924,5 +919,4 @@ function [xopt,fopt,exitflag,output,lambda,gradient,hessian] = fmincon (varargin break; end - endfunction diff --git a/macros/fminimax.bin b/macros/fminimax.bin Binary files differdeleted file mode 100644 index 8a8a8a4..0000000 --- a/macros/fminimax.bin +++ /dev/null diff --git a/macros/fminunc.bin b/macros/fminunc.bin Binary files differdeleted file mode 100644 index aa82fc3..0000000 --- a/macros/fminunc.bin +++ /dev/null diff --git a/macros/lib b/macros/lib Binary files differdeleted file mode 100644 index f7602af..0000000 --- a/macros/lib +++ /dev/null diff --git a/macros/linprog.bin b/macros/linprog.bin Binary files differdeleted file mode 100644 index 1d3a5aa..0000000 --- a/macros/linprog.bin +++ /dev/null diff --git a/macros/lsqlin.bin b/macros/lsqlin.bin Binary files differdeleted file mode 100644 index 7baf7be..0000000 --- a/macros/lsqlin.bin +++ /dev/null diff --git a/macros/lsqnonneg.bin b/macros/lsqnonneg.bin Binary files differdeleted file mode 100644 index 32620d0..0000000 --- a/macros/lsqnonneg.bin +++ /dev/null diff --git a/macros/matrix_linprog.bin b/macros/matrix_linprog.bin Binary files differdeleted file mode 100644 index e3a9db3..0000000 --- a/macros/matrix_linprog.bin +++ /dev/null diff --git a/macros/mps_linprog.bin b/macros/mps_linprog.bin Binary files differdeleted file mode 100644 index c0d2e3e..0000000 --- a/macros/mps_linprog.bin +++ /dev/null diff --git a/macros/names b/macros/names deleted file mode 100644 index bff51fe..0000000 --- a/macros/names +++ /dev/null @@ -1,21 +0,0 @@ -Checkdims -Checklhs -Checkrhs -Checktype -Checkvector -fgoalattain -fminbnd -fmincon -fminimax -fminunc -linprog -lsqlin -lsqnonneg -matrix_linprog -mps_linprog -qpipopt -qpipoptmat -setOptions -symphony -symphony_call -symphonymat diff --git a/macros/qpipopt.bin b/macros/qpipopt.bin Binary files differdeleted file mode 100644 index e2ba3de..0000000 --- a/macros/qpipopt.bin +++ /dev/null diff --git a/macros/qpipoptmat.bin b/macros/qpipoptmat.bin Binary files differdeleted file mode 100644 index 057fa29..0000000 --- a/macros/qpipoptmat.bin +++ /dev/null diff --git a/macros/qpipoptmat.sci b/macros/qpipoptmat.sci index e64a83a..41ec8e7 100644 --- a/macros/qpipoptmat.sci +++ b/macros/qpipoptmat.sci @@ -206,11 +206,6 @@ function [xopt,fopt,exitflag,output,lambda] = qpipoptmat (varargin) f = repmat(0,nbVar,1); end - if (type(param) ~= 15) then - errmsg = msprintf(gettext("%s: param should be a list "), "qpipoptmat"); - error(errmsg); - end - if (modulo(size(param),2)) then errmsg = msprintf(gettext("%s: Size of parameters should be even"), "qpipoptmat"); error(errmsg); @@ -226,11 +221,10 @@ function [xopt,fopt,exitflag,output,lambda] = qpipoptmat (varargin) Checktype("qpipoptmat", lb, "lb", 7, "constant") Checktype("qpipoptmat", ub, "ub", 8, "constant") Checktype("qpipoptmat", x0, "x0", 9, "constant") + Checktype("qpipoptmat", param, "param", 10, "list") - options = list(.. - "MaxIter" , [3000], ... - "CpuTime" , [600] ... - ); + options = list("MaxIter" , [3000], ... + "CpuTime" , [600]); for i = 1:(size(param))/2 @@ -299,7 +293,6 @@ function [xopt,fopt,exitflag,output,lambda] = qpipoptmat (varargin) error(errmsg); end - //Check the size of Lower Bound which should be equal to the number of variables if ( size(lb,1) ~= nbVar) then errmsg = msprintf(gettext("%s: The Lower Bound is not equal to the number of variables"), "qpipoptmat"); @@ -314,7 +307,7 @@ function [xopt,fopt,exitflag,output,lambda] = qpipoptmat (varargin) //Check the size of constraints of Lower Bound which should equal to the number of constraints if ( size(b,1) ~= nbConInEq & size(b,1) ~= 0) then - errmsg = msprintf(gettext("%s: The number of rows in A must be the same as the number of elementsof b"), "qpipoptmat"); + errmsg = msprintf(gettext("%s: The number of rows in A must be the same as the number of elements of b"), "qpipoptmat"); error(errmsg); end diff --git a/macros/setOptions.bin b/macros/setOptions.bin Binary files differdeleted file mode 100644 index 8d23e73..0000000 --- a/macros/setOptions.bin +++ /dev/null diff --git a/macros/symphony.bin b/macros/symphony.bin Binary files differdeleted file mode 100644 index 2c3a43a..0000000 --- a/macros/symphony.bin +++ /dev/null diff --git a/macros/symphony_call.bin b/macros/symphony_call.bin Binary files differdeleted file mode 100644 index 5e0d5e1..0000000 --- a/macros/symphony_call.bin +++ /dev/null diff --git a/macros/symphonymat.bin b/macros/symphonymat.bin Binary files differdeleted file mode 100644 index 7dffa2f..0000000 --- a/macros/symphonymat.bin +++ /dev/null |