summaryrefslogtreecommitdiff
path: root/macros/symphony.sci
diff options
context:
space:
mode:
authorHarpreet2015-09-23 18:22:28 +0530
committerHarpreet2015-09-23 18:22:28 +0530
commite34332a406e4f3fba9b99c6f9ec5138edfcc6aa2 (patch)
treea7dd948f18ddb1927d482a56b4a3b56486cb7e3d /macros/symphony.sci
parent33bdd144438436b759bc8d0b0beba715f0e39e5d (diff)
downloadsymphony-e34332a406e4f3fba9b99c6f9ec5138edfcc6aa2.tar.gz
symphony-e34332a406e4f3fba9b99c6f9ec5138edfcc6aa2.tar.bz2
symphony-e34332a406e4f3fba9b99c6f9ec5138edfcc6aa2.zip
qpipopt added
Diffstat (limited to 'macros/symphony.sci')
-rw-r--r--macros/symphony.sci8
1 files changed, 4 insertions, 4 deletions
diff --git a/macros/symphony.sci b/macros/symphony.sci
index 18ab5e1..f221160 100644
--- a/macros/symphony.sci
+++ b/macros/symphony.sci
@@ -16,7 +16,7 @@ function [xopt,fopt,status,output] = symphony (varargin)
// xopt = symphony(nbVar,nbCon,objCoef,isInt,LB,UB,conMatrix,conLB,conUB)
// xopt = symphony(nbVar,nbCon,objCoef,isInt,LB,UB,conMatrix,conLB,conUB,objSense)
// xopt = symphony(nbVar,nbCon,objCoef,isInt,LB,UB,conMatrix,conLB,conUB,objSense,options)
- // [xopt,fopt,iter] = symphony( ... )
+ // [xopt,fopt,status,output] = symphony( ... )
//
// Parameters
// nbVar : a 1 x 1 matrix of doubles, number of variables
@@ -43,12 +43,12 @@ function [xopt,fopt,status,output] = symphony (varargin)
// \begin{eqnarray}
// &\mbox{min}_{x}
// & f(x) \\
- // & \text{subject to} & conLB \geq C(x) \leq conUB \\
- // & & lb \geq x \leq ub \\
+ // & \text{subject to} & conLB \leq C(x) \leq conUB \\
+ // & & lb \leq x \leq ub \\
// \end{eqnarray}
// </latex>
//
- //
+ // We are calling SYMPHONY written in C by gateway files for the actual computation. SYMPHONY was originally written by ​Ted Ralphs, ​Menal Guzelsoy and ​Ashutosh Mahajan.
//
// Examples
// //A basic case :