output added

6 files changed, 15 insertions, 10 deletions

diff --git a/macros/symphony.bin b/macros/symphony.bin
index 3d3d03a..e82e907 100644
--- a/macros/symphony.bin
+++ b/macros/symphony.bin
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
 
diff --git a/macros/symphony_call.bin b/macros/symphony_call.bin
index 742ccd5..b95e887 100644
--- a/macros/symphony_call.bin
+++ b/macros/symphony_call.bin
diff --git a/macros/symphony_call.sci b/macros/symphony_call.sci
index 843ad6a..ea5f34f 100644
--- a/macros/symphony_call.sci
+++ b/macros/symphony_call.sci
@@ -9,7 +9,7 @@
 // are also available at
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
-function [xopt,fopt,iter] = symphony_call(nbVar,nbCon,objCoef,isInt,LB,UB,conMatrix,conLB,conUB,objSense,options)
+function [xopt,fopt,status,output] = symphony_call(nbVar,nbCon,objCoef,isInt,LB,UB,conMatrix,conLB,conUB,objSense,options)
 
     //Opening Symphony environment 
     sym_open();
@@ -32,17 +32,21 @@ function [xopt,fopt,iter] = symphony_call(nbVar,nbCon,objCoef,isInt,LB,UB,conMat
     xopt = [];
     fopt = [];
     status = [];
-    iter = [];
+    output = [];
     
      if (~op) then
             xopt = sym_getVarSoln();
+            // Symphony gives a row matrix converting it to column matrix
+            xopt = xopt';
+            
             fopt = sym_getObjVal();
-            iter = sym_getIterCount();
     end
     
     status = sym_getStatus();
+    
+    output = struct("Iterations"      , []);
+      
+      output.Iterations = sym_getIterCount();
 
-    //Closing Symphony Environment
-    sym_close();
 
 endfunction
diff --git a/macros/symphony_mat.bin b/macros/symphony_mat.bin
index 56e69e8..bcc2d01 100644
--- a/macros/symphony_mat.bin
+++ b/macros/symphony_mat.bin
diff --git a/macros/symphony_mat.sci b/macros/symphony_mat.sci
index 747edff..dc11101 100644
--- a/macros/symphony_mat.sci
+++ b/macros/symphony_mat.sci
@@ -9,7 +9,7 @@
 // are also available at
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
-function [xopt,fopt,iter] = symphony_mat (varargin)
+function [xopt,fopt,status,iter] = symphony_mat (varargin)
   // Solves a mixed integer linear programming constrained optimization problem in intlinprog format.
   //
   //   Calling Sequence
@@ -236,6 +236,6 @@ function [xopt,fopt,iter] = symphony_mat (varargin)
     
     objSense = 1;
     
-   [xopt,fopt,iter] = symphony_call(nbVar,nbCon,objCoef,isInt,lb,ub,conMatrix,conLB,conUB,objSense,options);
+   [xopt,fopt,status,iter] = symphony_call(nbVar,nbCon,objCoef,isInt,lb,ub,conMatrix,conLB,conUB,objSense,options);
 
 endfunction