diff options
| -rw-r--r-- | jar/scilab_en_US_help.jar | bin | 215075 -> 215075 bytes | |||
| -rw-r--r-- | macros/symphonymat.bin | bin | 60724 -> 60724 bytes | |||
| -rw-r--r-- | macros/symphonymat.sci | 24 |
3 files changed, 12 insertions, 12 deletions
diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar Binary files differindex 73ff5f1..5b41fec 100644 --- a/jar/scilab_en_US_help.jar +++ b/jar/scilab_en_US_help.jar diff --git a/macros/symphonymat.bin b/macros/symphonymat.bin Binary files differindex c123d3c..c6d4fbc 100644 --- a/macros/symphonymat.bin +++ b/macros/symphonymat.bin diff --git a/macros/symphonymat.sci b/macros/symphonymat.sci index f7e08ac..9226bd6 100644 --- a/macros/symphonymat.sci +++ b/macros/symphonymat.sci @@ -235,20 +235,20 @@ function [xopt,fopt,status,iter] = symphonymat (varargin) end for i=1:size(intcon,2) - if(intcon(i)>nbVar) then - errmsg = msprintf(gettext("%s: The values inside intcon should not exceed total number of variable "), "Symphonymat"); - error(errmsg); - end + if(intcon(i)>nbVar) then + errmsg = msprintf(gettext("%s: The values inside intcon should not exceed total number of variable "), "Symphonymat"); + error(errmsg); + end - if (intcon(i)<1) then - errmsg = msprintf(gettext("%s: The values inside intcon should be greater than 0 "), "Symphonymat"); - error(errmsg); - end + if (intcon(i)<0) then + errmsg = msprintf(gettext("%s: The values inside intcon should be greater than 0 "), "Symphonymat"); + error(errmsg); + end - if(modulo(intcon(i),1)) then - errmsg = msprintf(gettext("%s: The values inside intcon should be integer "), "Symphonymat"); - error(errmsg); - end + if(modulo(intcon(i),1)) then + errmsg = msprintf(gettext("%s: The values inside intcon should be integer "), "Symphonymat"); + error(errmsg); + end end //Check the size of inequality constraint which should equal to the number of inequality constraints |