From dd3d72ae2cdb43311b4e501966f09694bbd3e505 Mon Sep 17 00:00:00 2001 From: Harpreet Date: Thu, 7 Jan 2016 17:14:07 +0530 Subject: lower bound, upper bound test added --- help/en_US/lsqlin.xml | 16 ++++++++-------- help/en_US/lsqnonneg.xml | 8 ++++---- help/en_US/qpipopt.xml | 6 +++--- help/en_US/qpipoptmat.xml | 8 ++++---- help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS | Bin 7094 -> 7090 bytes .../en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB | Bin 781 -> 781 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS | Bin 266 -> 266 bytes .../scilab_en_US_help/JavaHelpSearch/POSITIONS | Bin 34656 -> 34613 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA | 2 +- help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP | Bin 16384 -> 16384 bytes help/en_US/scilab_en_US_help/lsqlin.html | 16 ++++++++-------- help/en_US/scilab_en_US_help/lsqnonneg.html | 8 ++++---- help/en_US/scilab_en_US_help/qpipopt.html | 6 +++--- help/en_US/scilab_en_US_help/qpipoptmat.html | 8 ++++---- help/en_US/scilab_en_US_help/symphony.html | 6 +++--- help/en_US/scilab_en_US_help/symphonymat.html | 8 ++++---- help/en_US/symphony.xml | 6 +++--- help/en_US/symphonymat.xml | 8 ++++---- 18 files changed, 53 insertions(+), 53 deletions(-) (limited to 'help') diff --git a/help/en_US/lsqlin.xml b/help/en_US/lsqlin.xml index 0904933..8887f30 100644 --- a/help/en_US/lsqlin.xml +++ b/help/en_US/lsqlin.xml @@ -38,17 +38,17 @@ Parameters C : - a matrix of double, represents the multiplier of the solution x in the expression C*x - d. Number of columns in C is equal to the number of elements in x. + a matrix of double, represents the multiplier of the solution x in the expression C⋅x - d. Number of columns in C is equal to the number of elements in x. d : - a vector of double, represents the additive constant term in the expression C*x - d. Number of elements in d is equal to the number of rows in C matrix. + a vector of double, represents the additive constant term in the expression C⋅x - d. Number of elements in d is equal to the number of rows in C matrix. A : - a vector of double, represents the linear coefficients in the inequality constraints + a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b. b : - a vector of double, represents the linear coefficients in the inequality constraints + a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b. Aeq : - a matrix of double, represents the linear coefficients in the equality constraints + a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq. beq : - a vector of double, represents the linear coefficients in the equality constraints + a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq. lb : a vector of double, contains lower bounds of the variables. ub : @@ -60,9 +60,9 @@ xopt : a vector of double, the computed solution of the optimization problem. resnorm : - a double, objective value returned as the scalar value norm(C*x-d)^2. + 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 d-C*x. + a vector of double, solution residuals returned as the vector d-C⋅x. exitflag : The exit status. See below for details. output : diff --git a/help/en_US/lsqnonneg.xml b/help/en_US/lsqnonneg.xml index 201e878..07cf7e6 100644 --- a/help/en_US/lsqnonneg.xml +++ b/help/en_US/lsqnonneg.xml @@ -35,15 +35,15 @@ Parameters C : - a matrix of double, represents the multiplier of the solution x in the expression C*x - d. Number of columns in C is equal to the number of elements in x. + a matrix of double, represents the multiplier of the solution x in the expression C⋅x - d. Number of columns in C is equal to the number of elements in x. d : - a vector of double, represents the additive constant term in the expression C*x - d. Number of elements in d is equal to the number of rows in C matrix. + a vector of double, represents the additive constant term in the expression C⋅x - d. Number of elements in d is equal to the number of rows in C matrix. xopt : a vector of double, the computed solution of the optimization problem. resnorm : - a double, objective value returned as the scalar value norm(C*x-d)^2. + 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 d-C*x. + a vector of double, solution residuals returned as the vector d-C⋅x. exitflag : The exit status. See below for details. output : diff --git a/help/en_US/qpipopt.xml b/help/en_US/qpipopt.xml index 170b457..a309a94 100644 --- a/help/en_US/qpipopt.xml +++ b/help/en_US/qpipopt.xml @@ -48,11 +48,11 @@ ub : a vector of double, contains upper bounds of the variables. A : - a matrix of double, contains the constraint matrix + a matrix of double, contains the constraint matrix conLB ≤ A⋅x ≤ conUB. conLB : - a vector of double, contains lower bounds of the constraints. + a vector of double, contains lower bounds of the constraints conLB ≤ A⋅x ≤ conUB. conUB : - a vector of double, contains upper bounds of the constraints. + a vector of double, contains upper bounds of the constraints conLB ≤ A⋅x ≤ conUB. x0 : a vector of double, contains initial guess of variables. param : diff --git a/help/en_US/qpipoptmat.xml b/help/en_US/qpipoptmat.xml index 82249a7..642971d 100644 --- a/help/en_US/qpipoptmat.xml +++ b/help/en_US/qpipoptmat.xml @@ -43,13 +43,13 @@ f : a vector of double, represents coefficients of linear in the quadratic problem A : - a vector of double, represents the linear coefficients in the inequality constraints + a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b. b : - a vector of double, represents the linear coefficients in the inequality constraints + a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b. Aeq : - a matrix of double, represents the linear coefficients in the equality constraints + a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq. beq : - a vector of double, represents the linear coefficients in the equality constraints + a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq. lb : a vector of double, contains lower bounds of the variables. ub : diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS index 8323669..2a1feb2 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 ba30e61..386e0dd 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 6e8476f..465e052 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 9cd3f49..629f1cc 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 f4e9ef7..dab0526 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=1280 id2=1 +TMAP bs=2048 rt=1 fl=-1 id1=1279 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 12891d8..775c132 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 7dbb227..db24b63 100644 --- a/help/en_US/scilab_en_US_help/lsqlin.html +++ b/help/en_US/scilab_en_US_help/lsqlin.html @@ -46,17 +46,17 @@

Parameters

C : -

a matrix of double, represents the multiplier of the solution x in the expression C*x - d. Number of columns in C is equal to the number of elements in x.

+

a matrix of double, represents the multiplier of the solution x in the expression C⋅x - d. Number of columns in C is equal to the number of elements in x.

d : -

a vector of double, represents the additive constant term in the expression C*x - d. Number of elements in d is equal to the number of rows in C matrix.

+

a vector of double, represents the additive constant term in the expression C⋅x - d. Number of elements in d is equal to the number of rows in C matrix.

A : -

a vector of double, represents the linear coefficients in the inequality constraints

+

a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.

b : -

a vector of double, represents the linear coefficients in the inequality constraints

+

a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.

Aeq : -

a matrix of double, represents the linear coefficients in the equality constraints

+

a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.

beq : -

a vector of double, represents the linear coefficients in the equality constraints

+

a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.

lb :

a vector of double, contains lower bounds of the variables.

ub : @@ -68,9 +68,9 @@
xopt :

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

resnorm : -

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

+

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 d-C*x.

+

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

exitflag :

The exit status. See below for details.

output : diff --git a/help/en_US/scilab_en_US_help/lsqnonneg.html b/help/en_US/scilab_en_US_help/lsqnonneg.html index a8e6801..8de3559 100644 --- a/help/en_US/scilab_en_US_help/lsqnonneg.html +++ b/help/en_US/scilab_en_US_help/lsqnonneg.html @@ -43,15 +43,15 @@

Parameters

C : -

a matrix of double, represents the multiplier of the solution x in the expression C*x - d. Number of columns in C is equal to the number of elements in x.

+

a matrix of double, represents the multiplier of the solution x in the expression C⋅x - d. Number of columns in C is equal to the number of elements in x.

d : -

a vector of double, represents the additive constant term in the expression C*x - d. Number of elements in d is equal to the number of rows in C matrix.

+

a vector of double, represents the additive constant term in the expression C⋅x - d. Number of elements in d is equal to the number of rows in C matrix.

xopt :

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

resnorm : -

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

+

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 d-C*x.

+

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

exitflag :

The exit status. See below for details.

output : diff --git a/help/en_US/scilab_en_US_help/qpipopt.html b/help/en_US/scilab_en_US_help/qpipopt.html index fc08a81..19b4e44 100644 --- a/help/en_US/scilab_en_US_help/qpipopt.html +++ b/help/en_US/scilab_en_US_help/qpipopt.html @@ -56,11 +56,11 @@
ub :

a vector of double, contains upper bounds of the variables.

A : -

a matrix of double, contains the constraint matrix

+

a matrix of double, contains the constraint matrix conLB ≤ A⋅x ≤ conUB.

conLB : -

a vector of double, contains lower bounds of the constraints.

+

a vector of double, contains lower bounds of the constraints conLB ≤ A⋅x ≤ conUB.

conUB : -

a vector of double, contains upper bounds of the constraints.

+

a vector of double, contains upper bounds of the constraints conLB ≤ A⋅x ≤ conUB.

x0 :

a vector of double, contains initial guess of variables.

param : diff --git a/help/en_US/scilab_en_US_help/qpipoptmat.html b/help/en_US/scilab_en_US_help/qpipoptmat.html index 4a89648..5a6a5b6 100644 --- a/help/en_US/scilab_en_US_help/qpipoptmat.html +++ b/help/en_US/scilab_en_US_help/qpipoptmat.html @@ -51,13 +51,13 @@
f :

a vector of double, represents coefficients of linear in the quadratic problem

A : -

a vector of double, represents the linear coefficients in the inequality constraints

+

a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.

b : -

a vector of double, represents the linear coefficients in the inequality constraints

+

a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.

Aeq : -

a matrix of double, represents the linear coefficients in the equality constraints

+

a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.

beq : -

a vector of double, represents the linear coefficients in the equality constraints

+

a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.

lb :

a vector of double, contains lower bounds of the variables.

ub : diff --git a/help/en_US/scilab_en_US_help/symphony.html b/help/en_US/scilab_en_US_help/symphony.html index d5b21cd..63c1db3 100644 --- a/help/en_US/scilab_en_US_help/symphony.html +++ b/help/en_US/scilab_en_US_help/symphony.html @@ -56,11 +56,11 @@
ub :

a vector of double, represents upper bounds of the variables.

A : -

a matrix of double, represents matrix representing the constraint matrix.

+

a matrix of double, represents matrix representing the constraint matrix conLB ≤ A⋅x ≤ conUB.

conLB : -

a vector of double, represents lower bounds of the constraints.

+

a vector of double, represents lower bounds of the constraints conLB ≤ A⋅x ≤ conUB.

conUB : -

a vector of double, represents upper bounds of the constraints

+

a vector of double, represents upper bounds of the constraints conLB ≤ A⋅x ≤ conUB.

objSense :

The sense (maximization/minimization) of the objective. Use 1(sym_minimize ) or -1 (sym_maximize) here.

options : diff --git a/help/en_US/scilab_en_US_help/symphonymat.html b/help/en_US/scilab_en_US_help/symphonymat.html index db8ffee..1f6af60 100644 --- a/help/en_US/scilab_en_US_help/symphonymat.html +++ b/help/en_US/scilab_en_US_help/symphonymat.html @@ -49,13 +49,13 @@
intcon :

Vector of integer constraints, specified as a vector of positive integers. The values in intcon indicate the components of the decision variable x that are integer-valued. intcon has values from 1 through number of variable.

A : -

Linear inequality constraint matrix, specified as a matrix of double. A represents the linear coefficients in the constraints A*x ≤ b. A has the size where columns equals to the number of variables.

+

a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.

b : -

Linear inequality constraint vector, specified as a vector of double. b represents the constant vector in the constraints A*x ≤ b. b has size equals to the number of rows in A.

+

a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.

Aeq : -

Linear equality constraint matrix, specified as a matrix of double. Aeq represents the linear coefficients in the constraints Aeq*x = beq. Aeq has the size where columns equals to the number of variables.

+

a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.

beq : -

Linear equality constraint vector, specified as a vector of double. beq represents the constant vector in the constraints Aeq*x = beq. beq has size equals to the number of rows in Aeq.

+

a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.

lb :

Lower bounds, specified as a vector or array of double. lb represents the lower bounds elementwise in lb ≤ x ≤ ub.

ub : diff --git a/help/en_US/symphony.xml b/help/en_US/symphony.xml index 68f1742..d11fafc 100644 --- a/help/en_US/symphony.xml +++ b/help/en_US/symphony.xml @@ -48,11 +48,11 @@ ub : a vector of double, represents upper bounds of the variables. A : - a matrix of double, represents matrix representing the constraint matrix. + a matrix of double, represents matrix representing the constraint matrix conLB ≤ A⋅x ≤ conUB. conLB : - a vector of double, represents lower bounds of the constraints. + a vector of double, represents lower bounds of the constraints conLB ≤ A⋅x ≤ conUB. conUB : - a vector of double, represents upper bounds of the constraints + a vector of double, represents upper bounds of the constraints conLB ≤ A⋅x ≤ conUB. objSense : The sense (maximization/minimization) of the objective. Use 1(sym_minimize ) or -1 (sym_maximize) here. options : diff --git a/help/en_US/symphonymat.xml b/help/en_US/symphonymat.xml index 33ed973..32059cb 100644 --- a/help/en_US/symphonymat.xml +++ b/help/en_US/symphonymat.xml @@ -41,13 +41,13 @@ intcon : Vector of integer constraints, specified as a vector of positive integers. The values in intcon indicate the components of the decision variable x that are integer-valued. intcon has values from 1 through number of variable. A : - Linear inequality constraint matrix, specified as a matrix of double. A represents the linear coefficients in the constraints A*x ≤ b. A has the size where columns equals to the number of variables. + a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b. b : - Linear inequality constraint vector, specified as a vector of double. b represents the constant vector in the constraints A*x ≤ b. b has size equals to the number of rows in A. + a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b. Aeq : - Linear equality constraint matrix, specified as a matrix of double. Aeq represents the linear coefficients in the constraints Aeq*x = beq. Aeq has the size where columns equals to the number of variables. + a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq. beq : - Linear equality constraint vector, specified as a vector of double. beq represents the constant vector in the constraints Aeq*x = beq. beq has size equals to the number of rows in Aeq. + a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq. lb : Lower bounds, specified as a vector or array of double. lb represents the lower bounds elementwise in lb ≤ x ≤ ub. ub : -- cgit