From d5356061fbd3a9b3052dee25bd9c82c375c42e22 Mon Sep 17 00:00:00 2001 From: Harpreet Date: Thu, 31 Dec 2015 16:03:57 +0530 Subject: Macros example updated --- help/en_US/lsqlin.xml | 72 ++++++++++----------- help/en_US/lsqnonneg.xml | 26 ++++---- help/en_US/qpipopt.xml | 57 ++++++++-------- help/en_US/qpipoptmat.xml | 33 +++++----- help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS | Bin 7534 -> 6899 bytes .../scilab_en_US_help/JavaHelpSearch/DOCS.TAB | Bin 872 -> 761 bytes .../en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS | Bin 270 -> 264 bytes .../scilab_en_US_help/JavaHelpSearch/POSITIONS | Bin 36377 -> 33375 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA | 2 +- help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP | Bin 16384 -> 14336 bytes help/en_US/scilab_en_US_help/lsqlin.html | 72 ++++++++++----------- help/en_US/scilab_en_US_help/lsqnonneg.html | 26 ++++---- help/en_US/scilab_en_US_help/qpipopt.html | 51 ++++++++------- help/en_US/scilab_en_US_help/qpipoptmat.html | 35 +++++----- help/en_US/scilab_en_US_help/symphony.html | 7 +- help/en_US/scilab_en_US_help/symphonymat.html | 6 +- help/en_US/symphony.xml | 5 +- help/en_US/symphonymat.xml | 4 +- 18 files changed, 195 insertions(+), 201 deletions(-) (limited to 'help/en_US') diff --git a/help/en_US/lsqlin.xml b/help/en_US/lsqlin.xml index c08905e..c6ec286 100644 --- a/help/en_US/lsqlin.xml +++ b/help/en_US/lsqlin.xml @@ -62,13 +62,13 @@ resnorm : a double, objective value returned as the scalar value norm(C*x-d)^2. residual : - a vector of double, solution residuals returned as the vector C*x-d. + a vector of double, solution residuals returned as the vector d-C*x. exitflag : - Integer identifying the reason the algorithm terminated. It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the lsqlin macro. + A flag showing returned exit flag from Ipopt. It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the lsqlin macro. output : Structure containing information about the optimization. This version only contains number of iterations. lambda : - Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper bound multiplier and linear equality, inequality constraints. + Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper bound multiplier and linear equality, inequality constraint multiplier. @@ -99,22 +99,16 @@ The routine calls Ipopt for solving the linear least square problem, Ipopt is a Examples Examples diff --git a/help/en_US/lsqnonneg.xml b/help/en_US/lsqnonneg.xml index 662ba2a..5d78bbd 100644 --- a/help/en_US/lsqnonneg.xml +++ b/help/en_US/lsqnonneg.xml @@ -43,13 +43,13 @@ resnorm : a double, objective value returned as the scalar value norm(C*x-d)^2. residual : - a vector of double, solution residuals returned as the vector C*x-d. + a vector of double, solution residuals returned as the vector d-C*x. exitflag : - Integer identifying the reason the algorithm terminated. It could be 0, 1 or 2 i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. + A flag showing returned exit flag from Ipopt. It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the lsqlin macro. output : Structure containing information about the optimization. This version only contains number of iterations. lambda : - Structure containing the Lagrange multipliers at the solution x. It contains lower and upper bound multiplier. + Structure containing the Lagrange multipliers at the solution xopt. It contains lower, upper bound multiplier and linear equality, inequality constraint multiplier. @@ -78,16 +78,16 @@ The routine calls Ipopt for solving the nonnegative least-squares curve fitting Examples diff --git a/help/en_US/qpipopt.xml b/help/en_US/qpipopt.xml index 6dd578d..3ba2107 100644 --- a/help/en_US/qpipopt.xml +++ b/help/en_US/qpipopt.xml @@ -62,11 +62,11 @@ fopt : a double, the function value at x. exitflag : - Integer identifying the reason the algorithm terminated. It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the qpipopt macro. + A flag showing returned exit flag from Ipopt. It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the lsqlin macro. output : Structure containing information about the optimization. This version only contains number of iterations lambda : - Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper and linear equality, inequality constraints. + Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper bound multiplier and linear equality, inequality constraint multiplier. @@ -74,7 +74,6 @@ Description Search the minimum of a constrained linear quadratic optimization problem specified by : -find the minimum of f(x) such that @@ -93,6 +92,33 @@ The routine calls Ipopt for solving the quadratic problem, Ipopt is a library wr + + Examples + = 0, +// x2 >= 0 +H = [2 0 +0 8]; +f = [-8; -16]; +A = [1 1;1 0]; +conUB = [5;3]; +conLB = [-%inf; -%inf]; +lb = [0; 0]; +ub = [%inf; %inf]; +nbVar = 2; +nbCon = 2; +[xopt,fopt,exitflag,output,lambda] = qpipopt(nbVar,nbCon,H,f,lb,ub,A,conLB,conUB) +//Press ENTER to continue + + ]]> + + Examples - - - - Examples - diff --git a/help/en_US/qpipoptmat.xml b/help/en_US/qpipoptmat.xml index 8d0bc0c..1334603 100644 --- a/help/en_US/qpipoptmat.xml +++ b/help/en_US/qpipoptmat.xml @@ -62,12 +62,14 @@ a vector of double, the computed solution of the optimization problem. fopt : a double, the function value at x. + residual : + a vector of double, solution residuals returned as the vector d-C*x. exitflag : - Integer identifying the reason the algorithm terminated.It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the qpipoptmat macro. + A flag showing returned exit flag from Ipopt. It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the lsqlin macro. output : Structure containing information about the optimization. This version only contains number of iterations. lambda : - Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper and linear equality, inequality constraints. + Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper bound multiplier and linear equality, inequality constraint multiplier. @@ -75,7 +77,6 @@ Description Search the minimum of a constrained linear quadratic optimization problem specified by : -find the minimum of f(x) such that @@ -98,17 +99,19 @@ The routine calls Ipopt for solving the quadratic problem, Ipopt is a library wr Examples = 0, +// x2 >= 0 +H = [2 0 +0 8]; +f = [-8; -16]; +A = [1 1;1 0]; +b = [5;3]; lb = [0; 0]; ub = [%inf; %inf]; [xopt,fopt,exitflag,output,lambda] = qpipoptmat(H,f,A,b,[],[],lb,ub) @@ -134,7 +137,7 @@ x0 = repmat(0,6,1); param = list("MaxIter", 300, "CpuTime", 100); //and minimize 0.5*x'*H*x + f'*x with f=[1; 2; 3; 4; 5; 6]; H=eye(6,6); -[xopt,fopt,exitflag,output,lambda]=qpipoptmat(H,f,A,b,Aeq,beq,lb,ub,[],param) +[xopt,fopt,exitflag,output,lambda]=qpipoptmat(H,f,A,b,Aeq,beq,lb,ub,x0,param) ]]> diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS index 8ebf21b..d3146bf 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB index 728f68c..f0a1fcb 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS index 9468d7f..8a63187 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS index d5dee46..423d132 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA index e2b33d1..6df2edb 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA @@ -1,2 +1,2 @@ JavaSearch 1.0 -TMAP bs=2048 rt=1 fl=-1 id1=1446 id2=1 +TMAP bs=2048 rt=1 fl=-1 id1=1249 id2=1 diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP index 35dc462..6104335 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP and b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP differ diff --git a/help/en_US/scilab_en_US_help/lsqlin.html b/help/en_US/scilab_en_US_help/lsqlin.html index aef773d..e9253c5 100644 --- a/help/en_US/scilab_en_US_help/lsqlin.html +++ b/help/en_US/scilab_en_US_help/lsqlin.html @@ -70,13 +70,13 @@
resnorm :

a double, objective value returned as the scalar value norm(C*x-d)^2.

residual : -

a vector of double, solution residuals returned as the vector C*x-d.

+

a vector of double, solution residuals returned as the vector d-C*x.

exitflag : -

Integer identifying the reason the algorithm terminated. It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the lsqlin macro.

+

A flag showing returned exit flag from Ipopt. It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the lsqlin macro.

output :

Structure containing information about the optimization. This version only contains number of iterations.

lambda : -

Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper bound multiplier and linear equality, inequality constraints.

+

Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper bound multiplier and linear equality, inequality constraint multiplier.

Description

Search the minimum of a constrained linear least square problem specified by :

@@ -86,47 +86,41 @@

Examples

//A simple linear least square example
-C = [0.9501    0.7620    0.6153    0.4057
-0.2311    0.4564    0.7919    0.9354
-0.6068    0.0185    0.9218    0.9169
-0.4859    0.8214    0.7382    0.4102
-0.8912    0.4447    0.1762    0.8936];
-d = [0.0578
-0.3528
-0.8131
-0.0098
-0.1388];
-A = [0.2027    0.2721    0.7467    0.4659
-0.1987    0.1988    0.4450    0.4186
-0.6037    0.0152    0.9318    0.8462];
-b = [0.5251
-0.2026
-0.6721];
+C = [ 2 0;
+-1 1;
+0 2]
+d = [1
+0
+-1];
+A = [10 -2;
+-2 10];
+b = [4
+-4];
 [xopt,resnorm,residual,exitflag,output,lambda] = lsqlin(C,d,A,b)
 // Press ENTER to continue

Examples

//A basic example for equality, inequality constraints and variable bounds
-C = [0.9501    0.7620    0.6153    0.4057
-0.2311    0.4564    0.7919    0.9354
-0.6068    0.0185    0.9218    0.9169
-0.4859    0.8214    0.7382    0.4102
-0.8912    0.4447    0.1762    0.8936];
-d = [0.0578
-0.3528
-0.8131
-0.0098
-0.1388];
-A =[0.2027    0.2721    0.7467    0.4659
-0.1987    0.1988    0.4450    0.4186
-0.6037    0.0152    0.9318    0.8462];
-b =[0.5251
-0.2026
-0.6721];
-Aeq = [3 5 7 9];
-beq = 4;
-lb = -0.1*ones(4,1);
-ub = 2*ones(4,1);
+C = [1 1 1;
+1 1 0;
+0 1 1;
+1 0 0;
+0 0 1]
+d = [89;
+67;
+53;
+35;
+20;]
+A = [3 2 1;
+2 3 4;
+1 2 3];
+b = [191
+209
+162];
+Aeq = [1 2 1];
+beq = 10;
+lb = repmat(0.1,3,1);
+ub = repmat(4,3,1);
 [xopt,resnorm,residual,exitflag,output,lambda] = lsqlin(C,d,A,b,Aeq,beq,lb,ub)

Authors

diff --git a/help/en_US/scilab_en_US_help/lsqnonneg.html b/help/en_US/scilab_en_US_help/lsqnonneg.html index e9a9110..7211c40 100644 --- a/help/en_US/scilab_en_US_help/lsqnonneg.html +++ b/help/en_US/scilab_en_US_help/lsqnonneg.html @@ -51,13 +51,13 @@
resnorm :

a double, objective value returned as the scalar value norm(C*x-d)^2.

residual : -

a vector of double, solution residuals returned as the vector C*x-d.

+

a vector of double, solution residuals returned as the vector d-C*x.

exitflag : -

Integer identifying the reason the algorithm terminated. It could be 0, 1 or 2 i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded.

+

A flag showing returned exit flag from Ipopt. It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the lsqlin macro.

output :

Structure containing information about the optimization. This version only contains number of iterations.

lambda : -

Structure containing the Lagrange multipliers at the solution x. It contains lower and upper bound multiplier.

+

Structure containing the Lagrange multipliers at the solution xopt. It contains lower, upper bound multiplier and linear equality, inequality constraint multiplier.

Description

Solves nonnegative least-squares curve fitting problems specified by :

@@ -67,16 +67,16 @@

Examples

// A basic lsqnonneg problem
-C = [
-0.0372    0.2869
-0.6861    0.7071
-0.6233    0.6245
-0.6344    0.6170];
-d = [
-0.8587
-0.1781
-0.0747
-0.8405];
+C = [1 1 1;
+1 1 0;
+0 1 1;
+1 0 0;
+0 0 1]
+d = [89;
+67;
+53;
+35;
+20;]
 [xopt,resnorm,residual,exitflag,output,lambda] = lsqnonneg(C,d)

Authors

diff --git a/help/en_US/scilab_en_US_help/qpipopt.html b/help/en_US/scilab_en_US_help/qpipopt.html index 349bbc4..31f389f 100644 --- a/help/en_US/scilab_en_US_help/qpipopt.html +++ b/help/en_US/scilab_en_US_help/qpipopt.html @@ -70,19 +70,40 @@
fopt :

a double, the function value at x.

exitflag : -

Integer identifying the reason the algorithm terminated. It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the qpipopt macro.

+

A flag showing returned exit flag from Ipopt. It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the lsqlin macro.

output :

Structure containing information about the optimization. This version only contains number of iterations

lambda : -

Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper and linear equality, inequality constraints.

+

Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper bound multiplier and linear equality, inequality constraint multiplier.

Description

-

Search the minimum of a constrained linear quadratic optimization problem specified by : -find the minimum of f(x) such that

+

Search the minimum of a constrained linear quadratic optimization problem specified by :

The routine calls Ipopt for solving the quadratic problem, Ipopt is a library written in C++.

+

Examples

+
//Ref : example 14 :
+//https://www.me.utexas.edu/~jensen/ORMM/supplements/methods/nlpmethod/S2_quadratic.pdf
+// min. -8*x1*x1 -16*x2*x2 + x1 + 4*x2
+// such that
+//    x1 + x2 <= 5,
+//    x1 <= 3,
+//    x1 >= 0,
+//    x2 >= 0
+H = [2 0
+0 8];
+f = [-8; -16];
+A = [1 1;1 0];
+conUB = [5;3];
+conLB = [-%inf; -%inf];
+lb = [0; 0];
+ub = [%inf; %inf];
+nbVar = 2;
+nbCon = 2;
+[xopt,fopt,exitflag,output,lambda] = qpipopt(nbVar,nbCon,H,f,lb,ub,A,conLB,conUB)
+//Press ENTER to continue
+

Examples

//Find x in R^6 such that:
 A= [1,-1,1,0,3,1;
@@ -100,27 +121,7 @@ find the minimum of f(x) such that

nbCon = 5; x0 = repmat(0,nbVar,1); param = list("MaxIter", 300, "CpuTime", 100); -[xopt,fopt,exitflag,output,lambda]=qpipopt(nbVar,nbCon,H,f,lb,ub,A,conLB,conUB,x0,param) -// Press ENTER to continue
- -

Examples

-
//Find the value of x that minimize following function
-// f(x) = 0.5*x1^2 + x2^2 - x1*x2 - 2*x1 - 6*x2
-// Subject to:
-// x1 + x2 ≤ 2
-// –x1 + 2x2 ≤ 2
-// 2x1 + x2 ≤ 3
-// 0 ≤ x1, 0 ≤ x2.
-H = [1 -1; -1 2];
-f = [-2; -6];
-A = [1 1; -1 2; 2 1];
-conUB = [2; 2; 3];
-conLB = [-%inf; -%inf; -%inf];
-lb = [0; 0];
-ub = [%inf; %inf];
-nbVar = 2;
-nbCon = 3;
-[xopt,fopt,exitflag,output,lambda] = qpipopt(nbVar,nbCon,H,f,lb,ub,A,conLB,conUB)
+[xopt,fopt,exitflag,output,lambda]=qpipopt(nbVar,nbCon,H,f,lb,ub,A,conLB,conUB,x0,param)

Authors

  • Keyur Joshi, Saikiran, Iswarya, Harpreet Singh
diff --git a/help/en_US/scilab_en_US_help/qpipoptmat.html b/help/en_US/scilab_en_US_help/qpipoptmat.html index 73c7298..6c195ea 100644 --- a/help/en_US/scilab_en_US_help/qpipoptmat.html +++ b/help/en_US/scilab_en_US_help/qpipoptmat.html @@ -70,32 +70,35 @@

a vector of double, the computed solution of the optimization problem.

fopt :

a double, the function value at x.

+
residual : +

a vector of double, solution residuals returned as the vector d-C*x.

exitflag : -

Integer identifying the reason the algorithm terminated.It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the qpipoptmat macro.

+

A flag showing returned exit flag from Ipopt. It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the lsqlin macro.

output :

Structure containing information about the optimization. This version only contains number of iterations.

lambda : -

Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper and linear equality, inequality constraints.

+

Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper bound multiplier and linear equality, inequality constraint multiplier.

Description

-

Search the minimum of a constrained linear quadratic optimization problem specified by : -find the minimum of f(x) such that

+

Search the minimum of a constrained linear quadratic optimization problem specified by :

The routine calls Ipopt for solving the quadratic problem, Ipopt is a library written in C++.

Examples

-
//Find the value of x that minimize following function
-// f(x) = 0.5*x1^2 + x2^2 - x1*x2 - 2*x1 - 6*x2
-// Subject to:
-// x1 + x2 ≤ 2
-// –x1 + 2x2 ≤ 2
-// 2x1 + x2 ≤ 3
-// 0 ≤ x1, 0 ≤ x2.
-H = [1 -1; -1 2];
-f = [-2; -6];
-A = [1 1; -1 2; 2 1];
-b = [2; 2; 3];
+   
//Ref : example 14 :
+//https://www.me.utexas.edu/~jensen/ORMM/supplements/methods/nlpmethod/S2_quadratic.pdf
+// min. -8*x1*x1 -16*x2*x2 + x1 + 4*x2
+// such that
+//    x1 + x2 <= 5,
+//    x1 <= 3,
+//    x1 >= 0,
+//    x2 >= 0
+H = [2 0
+0 8];
+f = [-8; -16];
+A = [1 1;1 0];
+b = [5;3];
 lb = [0; 0];
 ub = [%inf; %inf];
 [xopt,fopt,exitflag,output,lambda] = qpipoptmat(H,f,A,b,[],[],lb,ub)
@@ -116,7 +119,7 @@ find the minimum of f(x) such that

param = list("MaxIter", 300, "CpuTime", 100); //and minimize 0.5*x'*H*x + f'*x with f=[1; 2; 3; 4; 5; 6]; H=eye(6,6); -[xopt,fopt,exitflag,output,lambda]=qpipoptmat(H,f,A,b,Aeq,beq,lb,ub,[],param)
+[xopt,fopt,exitflag,output,lambda]=qpipoptmat(H,f,A,b,Aeq,beq,lb,ub,x0,param)

Authors

  • Keyur Joshi, Saikiran, Iswarya, Harpreet Singh
diff --git a/help/en_US/scilab_en_US_help/symphony.html b/help/en_US/scilab_en_US_help/symphony.html index b81bbb0..e374a30 100644 --- a/help/en_US/scilab_en_US_help/symphony.html +++ b/help/en_US/scilab_en_US_help/symphony.html @@ -70,19 +70,18 @@
fopt :

a double, the function value at x.

status : -

status flag from symphony. 227 is optimal, 228 is Time limit exceeded, 230 is iteration limit exceeded.

+

status flag returned from symphony. 227 is optimal, 228 is Time limit exceeded, 230 is iteration limit exceeded.

output :

The output data structure contains detailed information about the optimization process. This version only contains number of iterations

Description

-

Search the minimum or maximum of a constrained mixed integer linear programming optimization problem specified by : -find the minimum or maximum of f(x) such that

+

Search the minimum or maximum of a constrained mixed integer linear programming optimization problem specified by :

The routine calls SYMPHONY written in C by gateway files for the actual computation.

Examples

-
//A basic case :
+   
//Reference: Westerberg, Carl-Henrik, Bengt Bjorklund, and Eskil Hultman. "An application of mixed integer programming in a Swedish steel mill." Interfaces 7, no. 2 (1977): 39-43.
 // Objective function
 c = [350*5,330*3,310*4,280*6,500,450,400,100]';
 // Lower Bound of variable
diff --git a/help/en_US/scilab_en_US_help/symphonymat.html b/help/en_US/scilab_en_US_help/symphonymat.html
index fc60daf..203f2d4 100644
--- a/help/en_US/scilab_en_US_help/symphonymat.html
+++ b/help/en_US/scilab_en_US_help/symphonymat.html
@@ -67,19 +67,19 @@
    
fopt :

a double, the function value at x

status : -

status flag from symphony. 227 is optimal, 228 is Time limit exceeded, 230 is iteration limit exceeded.

+

status flag returned from symphony. 227 is optimal, 228 is Time limit exceeded, 230 is iteration limit exceeded.

output :

The output data structure contains detailed information about the optimization process. This version only contains number of iterations.

Description

-

Search the minimum or maximum of a constrained mixed integer linear programming optimization problem specified by : -find the minimum or maximum of C'⋅x such that

+

Search the minimum or maximum of a constrained mixed integer linear programming optimization problem specified by :

The routine calls SYMPHONY written in C by gateway files for the actual computation.

Examples

// Objective function
+// Reference: Westerberg, Carl-Henrik, Bengt Bjorklund, and Eskil Hultman. "An application of mixed integer programming in a Swedish steel mill." Interfaces 7, no. 2 (1977): 39-43.
 c = [350*5,330*3,310*4,280*6,500,450,400,100]';
 // Lower Bound of variable
 lb = repmat(0,1,8);
diff --git a/help/en_US/symphony.xml b/help/en_US/symphony.xml
index c0caa8e..da156ce 100644
--- a/help/en_US/symphony.xml
+++ b/help/en_US/symphony.xml
@@ -62,7 +62,7 @@
    fopt :
        a double, the function value at x.
    status :
-       status flag from symphony. 227 is optimal, 228 is Time limit exceeded, 230 is iteration limit exceeded.
+       status flag returned from symphony. 227 is optimal, 228 is Time limit exceeded, 230 is iteration limit exceeded.
    output :
        The output data structure contains detailed information about the optimization process. This version only contains number of iterations
    
@@ -72,7 +72,6 @@
    Description
    
 Search the minimum or maximum of a constrained mixed integer linear programming optimization problem specified by :
-find the minimum or maximum of f(x) such that
    
    
 
@@ -95,7 +94,7 @@ The routine calls SYMPHONY written in C by gateway files for the actual computat
 
    Examples
    fopt :
        a double, the function value at x
    status :
-       status flag from symphony. 227 is optimal, 228 is Time limit exceeded, 230 is iteration limit exceeded.
+       status flag returned from symphony. 227 is optimal, 228 is Time limit exceeded, 230 is iteration limit exceeded.
    output :
        The output data structure contains detailed information about the optimization process. This version only contains number of iterations.
    
@@ -69,7 +69,6 @@
    Description
    
 Search the minimum or maximum of a constrained mixed integer linear programming optimization problem specified by :
-find the minimum or maximum of C'⋅x such that
    
    
 
@@ -94,6 +93,7 @@ The routine calls SYMPHONY written in C by gateway files for the actual computat
    Examples