From e4b59ea62dd9903445375c2aa1f52a52c5eab99f Mon Sep 17 00:00:00 2001
From: Harpreet
Date: Tue, 20 Oct 2015 14:23:25 +0530
Subject: qpipopt_mat added
---
help/en_US/master_help.xml | 2 +
help/en_US/qpipopt.xml | 45 +++----
help/en_US/qpipopt_mat.xml | 142 +++++++++++++++++++++
help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS | Bin 6413 -> 6478 bytes
.../scilab_en_US_help/JavaHelpSearch/DOCS.TAB | Bin 787 -> 796 bytes
.../en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS | Bin 248 -> 255 bytes
.../scilab_en_US_help/JavaHelpSearch/POSITIONS | Bin 30648 -> 31519 bytes
help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA | 2 +-
help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP | Bin 16384 -> 16384 bytes
.../scilab_en_US_help/_LaTeX_qpipopt_mat.xml_1.png | Bin 0 -> 3110 bytes
help/en_US/scilab_en_US_help/index.html | 6 +
help/en_US/scilab_en_US_help/jhelpmap.jhm | 1 +
help/en_US/scilab_en_US_help/jhelptoc.xml | 1 +
help/en_US/scilab_en_US_help/qpipopt.html | 49 ++++---
help/en_US/scilab_en_US_help/qpipopt_mat.html | 139 ++++++++++++++++++++
.../section_19f4f1e5726c01d683e8b82be0a7e910.html | 6 +
help/en_US/scilab_en_US_help/symphony.html | 4 +-
17 files changed, 344 insertions(+), 53 deletions(-)
create mode 100644 help/en_US/qpipopt_mat.xml
create mode 100644 help/en_US/scilab_en_US_help/_LaTeX_qpipopt_mat.xml_1.png
create mode 100644 help/en_US/scilab_en_US_help/qpipopt_mat.html
(limited to 'help')
diff --git a/help/en_US/master_help.xml b/help/en_US/master_help.xml
index 85ff9e0..791d3d0 100644
--- a/help/en_US/master_help.xml
+++ b/help/en_US/master_help.xml
@@ -2,6 +2,7 @@
+
@@ -79,6 +80,7 @@
Symphony Toolbox
&a6b85f6e0c98751f20b68663a23cb4cd2;
+&a44928acec52adf395379e18fcff06730;
&aca972f273143ecb39f56b42e4723ac67;
&a9953e61e8dd264a86df73772d3055e7f;
diff --git a/help/en_US/qpipopt.xml b/help/en_US/qpipopt.xml
index d93f758..144fe18 100644
--- a/help/en_US/qpipopt.xml
+++ b/help/en_US/qpipopt.xml
@@ -38,7 +38,7 @@
nbCon :
a 1 x 1 matrix of doubles, number of constraints
Q :
- a n x n matrix of doubles, where n is number of variables, represents coefficients of quadratic in the quadratic problem.
+ a n x n symmetric matrix of doubles, where n is number of variables, represents coefficients of quadratic in the quadratic problem.
p :
a 1 x n matrix of doubles, where n is number of variables, represents coefficients of linear in the quadratic problem
LB :
@@ -91,19 +91,17 @@ We are calling IPOpt for solving the quadratic problem, IPOpt is a library writt
Examples
Examples
= 0,
-// x2 >= 0
-conMatrix= [1 1];
-conLB=[-%inf];
-conUB = [5];
-//with x between ci and cs:
-lb=[0,0];
-ub=[3,%inf];
-//and minimize 0.5*x'*Q*x + p'*x with
-p=[-8,-16];
-Q=[1,0;0,4];
+//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.
+Q = [1 -1; -1 2];
+p = [-2; -6];
+conMatrix = [1 1; -1 2; 2 1];
+conUB = [2; 2; 3];
+conLB = [-%inf; -%inf; -%inf];
+lb = [0; 0];
+ub = [%inf; %inf];
nbVar = 2;
-nbCon = 1;
+nbCon = 3;
[xopt,fopt,exitflag,output,lambda] = qpipopt(nbVar,nbCon,Q,p,lb,ub,conMatrix,conLB,conUB)
]]>
diff --git a/help/en_US/qpipopt_mat.xml b/help/en_US/qpipopt_mat.xml
new file mode 100644
index 0000000..7dec2b1
--- /dev/null
+++ b/help/en_US/qpipopt_mat.xml
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+ qpipopt_mat
+ Solves a linear quadratic problem.
+
+
+
+
+ Calling Sequence
+
+ xopt = qpipopt_mat(nbVar,nbCon,Q,p,LB,UB,conMatrix,conLB,conUB)
+ x = qpipopt_mat(H,f)
+ x = qpipopt_mat(H,f,A,b)
+ x = qpipopt_mat(H,f,A,b,Aeq,beq)
+ x = qpipopt_mat(H,f,A,b,Aeq,beq,lb,ub)
+ [xopt,fopt,exitflag,output,lamda] = qpipopt_mat( ... )
+
+
+
+
+
+ Parameters
+
+ H :
+ a n x n matrix of doubles, where n is number of variables, represents coefficients of quadratic in the quadratic problem.
+ f :
+ a n x 1 matrix of doubles, where n is number of variables, represents coefficients of linear in the quadratic problem
+ A :
+ a m x n matrix of doubles, represents the linear coefficients in the inequality constraints
+ b :
+ a column vector of doubles, represents the linear coefficients in the inequality constraints
+ Aeq :
+ a meq x n matrix of doubles, represents the linear coefficients in the equality constraints
+ beq :
+ a vector of doubles, represents the linear coefficients in the equality constraints
+ LB :
+ a n x 1 matrix of doubles, where n is number of variables, contains lower bounds of the variables.
+ UB :
+ a n x 1 matrix of doubles, where n is number of variables, contains upper bounds of the variables.
+ xopt :
+ a nx1 matrix of doubles, the computed solution of the optimization problem.
+ fopt :
+ a 1x1 matrix of doubles, the function value at x.
+ exitflag :
+ Integer identifying the reason the algorithm terminated.
+ output :
+ Structure containing information about the optimization.
+ lambda :
+ Structure containing the Lagrange multipliers at the solution x (separated by constraint type).
+
+
+
+
+ Description
+
+Search the minimum of a constrained linear quadratic optimization problem specified by :
+find the minimum of f(x) such that
+
+
+
+\begin{eqnarray}
+&\mbox{min}_{x}
+& 1/2*x'*H*x + f'*x \\
+& \text{subject to} & A.x \leq b \\
+& & Aeq.x \leq beq \\
+& & lb \leq x \leq ub \\
+\end{eqnarray}
+
+
+
+We are calling IPOpt for solving the quadratic problem, IPOpt is a library written in C++. The code has been written by Andreas Wächter and Carl Laird.
+
+
+
+
+
+
+ Examples
+
+
+
+
+ Examples
+
+
+
+
+ Authors
+
+ Keyur Joshi, Saikiran, Iswarya, Harpreet Singh
+
+
+
diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS
index 388e399..1b55b83 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 7682874..3b7b18b 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 d55c7ec..e290f81 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 b598af6..7fd9ab2 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 60e895c..59337ab 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=1344 id2=1
+TMAP bs=2048 rt=1 fl=-1 id1=1347 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 31347cf..0f25c4d 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/_LaTeX_qpipopt_mat.xml_1.png b/help/en_US/scilab_en_US_help/_LaTeX_qpipopt_mat.xml_1.png
new file mode 100644
index 0000000..b6e2743
Binary files /dev/null and b/help/en_US/scilab_en_US_help/_LaTeX_qpipopt_mat.xml_1.png differ
diff --git a/help/en_US/scilab_en_US_help/index.html b/help/en_US/scilab_en_US_help/index.html
index 49a4619..2b1442a 100644
--- a/help/en_US/scilab_en_US_help/index.html
+++ b/help/en_US/scilab_en_US_help/index.html
@@ -38,6 +38,12 @@
+qpipopt_mat — Solves a linear quadratic problem.
+
+
+
+
+
symphony — Solves a mixed integer linear programming constrained optimization problem.
diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm
index 54670c0..1601f23 100644
--- a/help/en_US/scilab_en_US_help/jhelpmap.jhm
+++ b/help/en_US/scilab_en_US_help/jhelpmap.jhm
@@ -4,6 +4,7 @@
+
diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml
index b2d66e1..463b86d 100644
--- a/help/en_US/scilab_en_US_help/jhelptoc.xml
+++ b/help/en_US/scilab_en_US_help/jhelptoc.xml
@@ -4,6 +4,7 @@
+
diff --git a/help/en_US/scilab_en_US_help/qpipopt.html b/help/en_US/scilab_en_US_help/qpipopt.html
index 46b56c7..fba4521 100644
--- a/help/en_US/scilab_en_US_help/qpipopt.html
+++ b/help/en_US/scilab_en_US_help/qpipopt.html
@@ -20,7 +20,7 @@
- symphony >>
+ qpipopt_mat >>
|
@@ -46,7 +46,7 @@
nbCon :
a 1 x 1 matrix of doubles, number of constraints
Q :
- a n x n matrix of doubles, where n is number of variables, represents coefficients of quadratic in the quadratic problem.
+ a n x n symmetric matrix of doubles, where n is number of variables, represents coefficients of quadratic in the quadratic problem.
p :
a 1 x n matrix of doubles, where n is number of variables, represents coefficients of linear in the quadratic problem
LB :
@@ -79,41 +79,38 @@ find the minimum of f(x) such that
Examples
-
conMatrix= [1,-1,1,0,3,1;
-1,0,-3,-4,5,6;
2,5,3,0,1,0
0,1,0,1,2,-1;
-1,0,2,1,1,0];
-conLB=[1 2 3 -%inf -%inf]';
-conUB = [1 2 3 -1 2.5]';
-
-lb=[-1000 -10000 0 -1000 -1000 -1000];
-ub=[10000 100 1.5 100 100 1000];
+conLB=[1;2;3;-%inf;-%inf];
+conUB = [1;2;3;-1;2.5];
+lb=[-1000;-10000; 0; -1000; -1000; -1000];
+ub=[10000; 100; 1.5; 100; 100; 1000];
-p=[1;2;3;4;5;6]; Q=eye(6,6);
+p=[1; 2; 3; 4; 5; 6]; Q=eye(6,6);
nbVar = 6;
nbCon = 5;
[xopt,fopt,exitflag,output,lambda]=qpipopt(nbVar,nbCon,Q,p,lb,ub,conMatrix,conLB,conUB) | | | |
Examples
-
-
-
-
-
-
-conMatrix= [1 1];
-conLB=[-%inf];
-conUB = [5];
-
-lb=[0,0];
-ub=[3,%inf];
-
-p=[-8,-16];
-Q=[1,0;0,4];
+
+
+
+
+
+
+
+Q = [1 -1; -1 2];
+p = [-2; -6];
+conMatrix = [1 1; -1 2; 2 1];
+conUB = [2; 2; 3];
+conLB = [-%inf; -%inf; -%inf];
+lb = [0; 0];
+ub = [%inf; %inf];
nbVar = 2;
-nbCon = 1;
+nbCon = 3;
[xopt,fopt,exitflag,output,lambda] = qpipopt(nbVar,nbCon,Q,p,lb,ub,conMatrix,conLB,conUB) | | | |
Authors
@@ -133,7 +130,7 @@ find the minimum of f(x) such that
|
- symphony >>
+ qpipopt_mat >>
|
diff --git a/help/en_US/scilab_en_US_help/qpipopt_mat.html b/help/en_US/scilab_en_US_help/qpipopt_mat.html
new file mode 100644
index 0000000..5e30769
--- /dev/null
+++ b/help/en_US/scilab_en_US_help/qpipopt_mat.html
@@ -0,0 +1,139 @@
+
+
+
qpipopt_mat
+
+
+
+
+
+
+
+
Symphony Toolbox >> Symphony Toolbox > qpipopt_mat
+
+
+
qpipopt_mat
+
Solves a linear quadratic problem.
+
+
+
Calling Sequence
+
xopt = qpipopt_mat(nbVar,nbCon,Q,p,LB,UB,conMatrix,conLB,conUB)
+x = qpipopt_mat(H,f)
+x = qpipopt_mat(H,f,A,b)
+x = qpipopt_mat(H,f,A,b,Aeq,beq)
+x = qpipopt_mat(H,f,A,b,Aeq,beq,lb,ub)
+[xopt,fopt,exitflag,output,lamda] = qpipopt_mat( ... )
+
+
Parameters
+
- H :
+
a n x n matrix of doubles, where n is number of variables, represents coefficients of quadratic in the quadratic problem.
+ - f :
+
a n x 1 matrix of doubles, where n is number of variables, represents coefficients of linear in the quadratic problem
+ - A :
+
a m x n matrix of doubles, represents the linear coefficients in the inequality constraints
+ - b :
+
a column vector of doubles, represents the linear coefficients in the inequality constraints
+ - Aeq :
+
a meq x n matrix of doubles, represents the linear coefficients in the equality constraints
+ - beq :
+
a vector of doubles, represents the linear coefficients in the equality constraints
+ - LB :
+
a n x 1 matrix of doubles, where n is number of variables, contains lower bounds of the variables.
+ - UB :
+
a n x 1 matrix of doubles, where n is number of variables, contains upper bounds of the variables.
+ - xopt :
+
a nx1 matrix of doubles, the computed solution of the optimization problem.
+ - fopt :
+
a 1x1 matrix of doubles, the function value at x.
+ - exitflag :
+
Integer identifying the reason the algorithm terminated.
+ - output :
+
Structure containing information about the optimization.
+ - lambda :
+
Structure containing the Lagrange multipliers at the solution x (separated by constraint type).
+
+
Description
+
Search the minimum of a constrained linear quadratic optimization problem specified by :
+find the minimum of f(x) such that
+
+
We are calling IPOpt for solving the quadratic problem, IPOpt is a library written in C++. The code has been written by Andreas Wächter and Carl Laird.
+
+
+
Examples
+
+
+Aeq= [1,-1,1,0,3,1;
+-1,0,-3,-4,5,6;
+2,5,3,0,1,0];
+beq=[1; 2; 3];
+A= [0,1,0,1,2,-1;
+-1,0,2,1,1,0];
+b = [-1; 2.5];
+lb=[-1000; -10000; 0; -1000; -1000; -1000];
+ub=[10000; 100; 1.5; 100; 100; 1000];
+
+f=[1; 2; 3; 4; 5; 6]; H=eye(6,6);
+[xopt,fopt,exitflag,output,lambda]=qpipopt_mat(H,f,A,b,Aeq,beq,lb,ub)
+clear H f A b Aeq beq lb ub; | | | |
+
+
Examples
+
+
+
+
+
+
+
+H = [1 -1; -1 2];
+f = [-2; -6];
+A = [1 1; -1 2; 2 1];
+b = [2; 2; 3];
+lb = [0; 0];
+ub = [%inf; %inf];
+[xopt,fopt,exitflag,output,lambda] = qpipopt_mat(H,f,A,b,[],[],lb,ub) | | | |
+
+
Authors
+
- Keyur Joshi, Saikiran, Iswarya, Harpreet Singh
+
+
+
+
+
diff --git a/help/en_US/scilab_en_US_help/section_19f4f1e5726c01d683e8b82be0a7e910.html b/help/en_US/scilab_en_US_help/section_19f4f1e5726c01d683e8b82be0a7e910.html
index 0f8d441..ed07ab6 100644
--- a/help/en_US/scilab_en_US_help/section_19f4f1e5726c01d683e8b82be0a7e910.html
+++ b/help/en_US/scilab_en_US_help/section_19f4f1e5726c01d683e8b82be0a7e910.html
@@ -37,6 +37,12 @@
+
qpipopt_mat — Solves a linear quadratic problem.
+
+
+
+
+
symphony — Solves a mixed integer linear programming constrained optimization problem.
diff --git a/help/en_US/scilab_en_US_help/symphony.html b/help/en_US/scilab_en_US_help/symphony.html
index 7e155bc..0af9d1b 100644
--- a/help/en_US/scilab_en_US_help/symphony.html
+++ b/help/en_US/scilab_en_US_help/symphony.html
@@ -12,7 +12,7 @@