From ed526ee458eab28367de030f450838a038f2ed10 Mon Sep 17 00:00:00 2001
From: Harpreet
Date: Tue, 1 Sep 2015 14:21:55 +0530
Subject: Styling help

---
 macros/setOptions.bin    | Bin 3164 -> 3164 bytes
 macros/setOptions.sci    |   4 ++--
 macros/symphony_call.bin | Bin 3592 -> 3592 bytes
 macros/symphony_call.sci |   8 ++++----
 macros/symphony_mat.bin  | Bin 45256 -> 45340 bytes
 macros/symphony_mat.sci  |   2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'macros')

diff --git a/macros/setOptions.bin b/macros/setOptions.bin
index c0bb197..c5a69df 100644
Binary files a/macros/setOptions.bin and b/macros/setOptions.bin differ
diff --git a/macros/setOptions.sci b/macros/setOptions.sci
index 4fe4ac1..138e577 100644
--- a/macros/setOptions.sci
+++ b/macros/setOptions.sci
@@ -9,9 +9,9 @@
 // are also available at
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
-function setOptions(varagin)
+function setOptions(varargin)
 
-    options = varagin(1);
+    options = varargin(1);
     nbOpt = size(options,2);
     
     value = strtod(options)
diff --git a/macros/symphony_call.bin b/macros/symphony_call.bin
index 49ff7cb..7fecd8b 100644
Binary files a/macros/symphony_call.bin and b/macros/symphony_call.bin differ
diff --git a/macros/symphony_call.sci b/macros/symphony_call.sci
index 36abafc..38b6051 100644
--- a/macros/symphony_call.sci
+++ b/macros/symphony_call.sci
@@ -14,6 +14,9 @@ function [xopt,fopt,iter] = symphony_call(nbVar,nbCon,objCoef,isInt,LB,UB,conMat
     //Opening Symphony environment 
     sym_open();
 
+    //Setting Options for the Symphpony
+    setOptions(options);
+
    //Choosing to launch basic or advanced version
     if(~issparse(conMatrix)) then
         sym_loadProblemBasic(nbVar,nbCon,LB,UB,objCoef,isInt,objSense,conMatrix,conLB,conUB);
@@ -24,9 +27,6 @@ function [xopt,fopt,iter] = symphony_call(nbVar,nbCon,objCoef,isInt,LB,UB,conMat
     end
 
 
-    //Setting Options for the Symphpony
-    setOptions(options);
-
     op = sym_solve();
     
     xopt = [];
@@ -41,7 +41,7 @@ function [xopt,fopt,iter] = symphony_call(nbVar,nbCon,objCoef,isInt,LB,UB,conMat
     end
     
     status = sym_getStatus();
-    
+
 //    //Closing Symphony Environment
 //    sym_close();
 
diff --git a/macros/symphony_mat.bin b/macros/symphony_mat.bin
index 21ebf8c..56e69e8 100644
Binary files a/macros/symphony_mat.bin and b/macros/symphony_mat.bin differ
diff --git a/macros/symphony_mat.sci b/macros/symphony_mat.sci
index a0fa895..747edff 100644
--- a/macros/symphony_mat.sci
+++ b/macros/symphony_mat.sci
@@ -10,7 +10,7 @@
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
 function [xopt,fopt,iter] = symphony_mat (varargin)
-  // Solves a mixed integer linear programming constrained optimization problem.
+  // Solves a mixed integer linear programming constrained optimization problem in intlinprog format.
   //
   //   Calling Sequence
   //   xopt = symphony_mat(f,intcon,A,b)
-- 
cgit