summaryrefslogtreecommitdiff
path: root/macros/symphony.sci
diff options
context:
space:
mode:
authorHarpreet2015-09-10 12:37:16 +0530
committerHarpreet2015-09-10 12:37:16 +0530
commit33bdd144438436b759bc8d0b0beba715f0e39e5d (patch)
treef5a5305d24da68ecd984a3d5469f455a83e5344a /macros/symphony.sci
parentf1aea635ba1d5778860a335d1bf9546ee7adfc7f (diff)
downloadsymphony-33bdd144438436b759bc8d0b0beba715f0e39e5d.tar.gz
symphony-33bdd144438436b759bc8d0b0beba715f0e39e5d.tar.bz2
symphony-33bdd144438436b759bc8d0b0beba715f0e39e5d.zip
output added
Diffstat (limited to 'macros/symphony.sci')
-rw-r--r--macros/symphony.sci7
1 files changed, 4 insertions, 3 deletions
diff --git a/macros/symphony.sci b/macros/symphony.sci
index 01c93e1..18ab5e1 100644
--- a/macros/symphony.sci
+++ b/macros/symphony.sci
@@ -9,7 +9,7 @@
// are also available at
// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-function [xopt,fopt,iter] = symphony (varargin)
+function [xopt,fopt,status,output] = symphony (varargin)
// Solves a mixed integer linear programming constrained optimization problem.
//
// Calling Sequence
@@ -32,7 +32,8 @@ function [xopt,fopt,iter] = symphony (varargin)
// options : a 1xq marix of string, provided to set the paramters in symphony
// xopt : a 1xn matrix of doubles, the computed solution of the optimization problem
// fopt : a 1x1 matrix of doubles, the function value at x
- // iter : a 1x1 matrix of doubles, contains the number od iterations done by symphony
+ // status : status flag from symphony
+ // output : The output data structure contains detailed informations about the optimization process.
//
// Description
// Search the minimum or maximum of a constrained mixed integer linear programming optimization problem specified by :
@@ -220,7 +221,7 @@ function [xopt,fopt,iter] = symphony (varargin)
error(errmsg);
end
- [xopt,fopt,iter] = symphony_call(nbVar,nbCon,objCoef,isInt,LB,UB,conMatrix,conLB,conUB,objSense,options);
+ [xopt,fopt,status,output] = symphony_call(nbVar,nbCon,objCoef,isInt,LB,UB,conMatrix,conLB,conUB,objSense,options);
endfunction