diff options
| author | Harpreet | 2016-01-25 14:20:26 +0530 |
|---|---|---|
| committer | Harpreet | 2016-01-25 14:20:26 +0530 |
| commit | b97c2cb250a9af50112302461eb032fc31a02aae (patch) | |
| tree | f98dbda56443ad85f5e033beade1ed7fa19b854a /macros | |
| parent | a2d9c2bfd6eb83d1a494821176388eb312d08254 (diff) | |
| download | FOSSEE-Optimization-toolbox-b97c2cb250a9af50112302461eb032fc31a02aae.tar.gz FOSSEE-Optimization-toolbox-b97c2cb250a9af50112302461eb032fc31a02aae.tar.bz2 FOSSEE-Optimization-toolbox-b97c2cb250a9af50112302461eb032fc31a02aae.zip | |
fmincon updated
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/fgoalattain.bin | bin | 79236 -> 79072 bytes | |||
| -rw-r--r-- | macros/fminbnd.bin | bin | 53656 -> 53664 bytes | |||
| -rw-r--r-- | macros/fminbnd.sci | 7 | ||||
| -rw-r--r-- | macros/fmincon.bin | bin | 149436 -> 149444 bytes | |||
| -rw-r--r-- | macros/fmincon.sci | 4 | ||||
| -rw-r--r-- | macros/fminimax.bin | bin | 85668 -> 85724 bytes | |||
| -rw-r--r-- | macros/fminunc.bin | bin | 60820 -> 60828 bytes | |||
| -rw-r--r-- | macros/fminunc.sci | 4 | ||||
| -rw-r--r-- | macros/linprog.bin | bin | 28836 -> 28828 bytes | |||
| -rw-r--r-- | macros/linprog.sci | 3 |
10 files changed, 13 insertions, 5 deletions
diff --git a/macros/fgoalattain.bin b/macros/fgoalattain.bin Binary files differindex 1476d8e..e4d0024 100644 --- a/macros/fgoalattain.bin +++ b/macros/fgoalattain.bin diff --git a/macros/fminbnd.bin b/macros/fminbnd.bin Binary files differindex 76db1fb..df44ca0 100644 --- a/macros/fminbnd.bin +++ b/macros/fminbnd.bin diff --git a/macros/fminbnd.sci b/macros/fminbnd.sci index 2ebaa8c..c9bf4cc 100644 --- a/macros/fminbnd.sci +++ b/macros/fminbnd.sci @@ -153,6 +153,13 @@ function [xopt,fopt,exitflag,output,lambda] = fminbnd (varargin) fun = varargin(1); x1 = varargin(2); x2 = varargin(3); + + + //To check whether the 1st Input argument (fun) is a function or not + if (type(fun) ~= 13 & type(fun) ~= 11) then + errmsg = msprintf(gettext("%s: Expected function for Objective (1st Parameter)"), "fmincon"); + error(errmsg); + end //Converting the User defined Objective function into Required form (Error Detectable) function [y,check] = f(x) diff --git a/macros/fmincon.bin b/macros/fmincon.bin Binary files differindex 3ea45b3..2e93c02 100644 --- a/macros/fmincon.bin +++ b/macros/fmincon.bin diff --git a/macros/fmincon.sci b/macros/fmincon.sci index 2630683..6e2d064 100644 --- a/macros/fmincon.sci +++ b/macros/fmincon.sci @@ -303,8 +303,8 @@ function [xopt,fopt,exitflag,output,lambda,gradient,hessian] = fmincon (varargin nlc = varargin(9); end - //To check whether the 1st Input argument (f) is a function or not - if (type(f) ~= 13 & type(f) ~= 11) then + //To check whether the 1st Input argument (fun) is a function or not + if (type(fun) ~= 13 & type(fun) ~= 11) then errmsg = msprintf(gettext("%s: Expected function for Objective (1st Parameter)"), "fmincon"); error(errmsg); end diff --git a/macros/fminimax.bin b/macros/fminimax.bin Binary files differindex c40fcce..4243455 100644 --- a/macros/fminimax.bin +++ b/macros/fminimax.bin diff --git a/macros/fminunc.bin b/macros/fminunc.bin Binary files differindex b65c851..4d67d1b 100644 --- a/macros/fminunc.bin +++ b/macros/fminunc.bin diff --git a/macros/fminunc.sci b/macros/fminunc.sci index 07fa92a..f39c312 100644 --- a/macros/fminunc.sci +++ b/macros/fminunc.sci @@ -152,8 +152,8 @@ function [xopt,fopt,exitflag,output,gradient,hessian] = fminunc (varargin) fun = varargin(1); x0 = varargin(2); - //To check whether the 1st Input argument(f) is a function or not - if (type(f) ~= 13 & type(f) ~= 11) then + //To check whether the 1st Input argument(fun) is a function or not + if (type(fun) ~= 13 & type(fun) ~= 11) then errmsg = msprintf(gettext("%s: Expected function for Objective "), "fminunc"); error(errmsg); end diff --git a/macros/linprog.bin b/macros/linprog.bin Binary files differindex b9ba12a..82e3310 100644 --- a/macros/linprog.bin +++ b/macros/linprog.bin diff --git a/macros/linprog.sci b/macros/linprog.sci index 4c949ba..e3e2c71 100644 --- a/macros/linprog.sci +++ b/macros/linprog.sci @@ -18,7 +18,8 @@ function [xopt,fopt,exitflag,output,lambda] = linprog (varargin) // xopt = linprog(c,A,b,Aeq,beq) // xopt = linprog(c,A,b,Aeq,beq,lb,ub) // xopt = linprog(c,A,b,Aeq,beq,lb,ub,param) - // [xopt, fopt, exitflag, output, lambda] = linprog(file) + // xopt = linprog(file) + // xopt = linprog(file,param) // [xopt,fopt,exitflag,output,lambda] = linprog( ... ) // // Parameters |