From 6e9ee19cd67b0b85b7708efa4847c7ebb6d79f24 Mon Sep 17 00:00:00 2001 From: Harpreet Date: Tue, 22 Dec 2015 15:54:28 +0530 Subject: Bugs fixed 3 --- help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS | Bin 7496 -> 7491 bytes .../scilab_en_US_help/JavaHelpSearch/DOCS.TAB | Bin 868 -> 867 bytes .../en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS | Bin 270 -> 270 bytes .../scilab_en_US_help/JavaHelpSearch/POSITIONS | Bin 36157 -> 36132 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP | Bin 16384 -> 16384 bytes .../scilab_en_US_help/_LaTeX_symphonymat.xml_1.png | Bin 3160 -> 3187 bytes help/en_US/scilab_en_US_help/lsqlin.html | 22 ++++++------- help/en_US/scilab_en_US_help/qpipopt.html | 18 +++++------ help/en_US/scilab_en_US_help/qpipoptmat.html | 22 ++++++------- help/en_US/scilab_en_US_help/symphony.html | 16 +++++----- help/en_US/scilab_en_US_help/symphonymat.html | 34 ++++++++++----------- 11 files changed, 56 insertions(+), 56 deletions(-) (limited to 'help/en_US/scilab_en_US_help') diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS index 9b6386a..90b22d8 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 8f3ddaf..8cff552 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 d668ed6..62368d7 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 65379cd..c85a3ee 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/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP index e2f089a..80e09d1 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_symphonymat.xml_1.png b/help/en_US/scilab_en_US_help/_LaTeX_symphonymat.xml_1.png index 94c5200..2d61fb7 100644 Binary files a/help/en_US/scilab_en_US_help/_LaTeX_symphonymat.xml_1.png and b/help/en_US/scilab_en_US_help/_LaTeX_symphonymat.xml_1.png differ diff --git a/help/en_US/scilab_en_US_help/lsqlin.html b/help/en_US/scilab_en_US_help/lsqlin.html index b371871..b843257 100644 --- a/help/en_US/scilab_en_US_help/lsqlin.html +++ b/help/en_US/scilab_en_US_help/lsqlin.html @@ -46,31 +46,31 @@

Parameters

C : -

a matrix of doubles, represents the multiplier of the solution x in the expression C*x - d. C is M-by-N, where M is the number of equations, and N is the number of elements of x.

+

a matrix of double, represents the multiplier of the solution x in the expression C*x - d. C is M-by-N, where M is the number of equations, and N is the number of elements of x.

d : -

a vector of doubles, represents the additive constant term in the expression C*x - d. d is M-by-1, where M is the number of equations.

+

a vector of double, represents the additive constant term in the expression C*x - d. d is M-by-1, where M is the number of equations.

A : -

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

+

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

b : -

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

+

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

Aeq : -

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

+

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

beq : -

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

+

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

LB : -

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

+

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

UB : -

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

+

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

x0 : -

a vector of doubles, contains initial guess of variables.

+

a vector of double, contains initial guess of variables.

param :

a list containing the the parameters to be set.

xopt : -

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

+

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.

residual : -

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

+

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

exitflag :

Integer identifying the reason the algorithm terminated.

output : diff --git a/help/en_US/scilab_en_US_help/qpipopt.html b/help/en_US/scilab_en_US_help/qpipopt.html index 7cc0560..d4b6b3c 100644 --- a/help/en_US/scilab_en_US_help/qpipopt.html +++ b/help/en_US/scilab_en_US_help/qpipopt.html @@ -48,25 +48,25 @@
nbCon :

a double, number of constraints

Q : -

a symmetric matrix of doubles, represents coefficients of quadratic in the quadratic problem.

+

a symmetric matrix of double, represents coefficients of quadratic in the quadratic problem.

p : -

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

+

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

LB : -

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

+

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

UB : -

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

+

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

conMatrix : -

a matrix of doubles, contains matrix representing the constraint matrix

+

a matrix of double, contains matrix representing the constraint matrix

conLB : -

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

+

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

conUB : -

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

+

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

x0 : -

a vector of doubles, contains initial guess of variables.

+

a vector of double, contains initial guess of variables.

param :

a list containing the the parameters to be set.

xopt : -

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

+

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

fopt :

a double, the function value at x.

exitflag : diff --git a/help/en_US/scilab_en_US_help/qpipoptmat.html b/help/en_US/scilab_en_US_help/qpipoptmat.html index 8b81cac..2ed139d 100644 --- a/help/en_US/scilab_en_US_help/qpipoptmat.html +++ b/help/en_US/scilab_en_US_help/qpipoptmat.html @@ -47,27 +47,27 @@

Parameters

H : -

a symmetric matrix of doubles, represents coefficients of quadratic in the quadratic problem.

+

a symmetric matrix of double, represents coefficients of quadratic in the quadratic problem.

f : -

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

+

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

A : -

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

+

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

b : -

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

+

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

Aeq : -

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

+

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

beq : -

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

+

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

LB : -

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

+

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

UB : -

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

+

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

x0 : -

a vector of doubles, contains initial guess of variables.

+

a vector of double, contains initial guess of variables.

param :

a list containing the the parameters to be set.

xopt : -

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

+

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

fopt :

a double, the function value at x.

exitflag : @@ -114,7 +114,7 @@ find the minimum of f(x) such that

ub=[10000; 100; 1.5; 100; 100; 1000]; x0 = repmat(0,6,1); param = list("MaxIter", 300, "CpuTime", 100); -//and minimize 0.5*x'*Q*x + p'*x with +//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)
diff --git a/help/en_US/scilab_en_US_help/symphony.html b/help/en_US/scilab_en_US_help/symphony.html index 9b2bebe..96be830 100644 --- a/help/en_US/scilab_en_US_help/symphony.html +++ b/help/en_US/scilab_en_US_help/symphony.html @@ -48,25 +48,25 @@
nbCon :

a double, number of constraints.

objCoeff : -

a vector of doubles, represents coefficients of the variables in the objective.

+

a vector of double, represents coefficients of the variables in the objective.

isInt :

a vector of boolean, represents wether a variable is constrained to be an integer.

LB : -

a vector of doubles, represents lower bounds of the variables.

+

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

UB : -

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

+

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

conMatrix : -

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

+

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

conLB : -

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

+

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

conUB : -

a vector of doubles, represents upper bounds of the constraints

+

a vector of double, represents upper bounds of the constraints

objSense :

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

options :

a a list containing the the parameters to be set.

xopt : -

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

+

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

fopt :

a double, the function value at x.

status : @@ -84,7 +84,7 @@ find the minimum or maximum of f(x) such that

Examples

//A basic case :
 // Objective function
-c = [350*5,330*3,310*4,280*6,500,450,400,100]';
+objCoef = [350*5,330*3,310*4,280*6,500,450,400,100]';
 // Lower Bound of variable
 lb = repmat(0,8,1);
 // Upper Bound of variables
diff --git a/help/en_US/scilab_en_US_help/symphonymat.html b/help/en_US/scilab_en_US_help/symphonymat.html
index 611010b..c580508 100644
--- a/help/en_US/scilab_en_US_help/symphonymat.html
+++ b/help/en_US/scilab_en_US_help/symphonymat.html
@@ -37,35 +37,35 @@
 
 
 
Calling Sequence

-   
xopt = symphonymat(f,intcon,A,b)
-xopt = symphonymat(f,intcon,A,b,Aeq,beq)
-xopt = symphonymat(f,intcon,A,b,Aeq,beq,lb,ub)
-xopt = symphonymat(f,intcon,A,b,Aeq,beq,lb,ub,options)
+   
xopt = symphonymat(C,intcon,A,b)
+xopt = symphonymat(C,intcon,A,b,Aeq,beq)
+xopt = symphonymat(C,intcon,A,b,Aeq,beq,lb,ub)
+xopt = symphonymat(C,intcon,A,b,Aeq,beq,lb,ub,options)
 [xopt,fopt,status,output] = symphonymat( ... )

 
 
Parameters

    
f :
-      
a vector of doubles, contains coefficients of the variables in the objective

+      
a vector of double, contains coefficients of the variables in the objective

    
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 doubles. A represents the linear coefficients in the constraints A*x ≤ b. A has size M-by-N, where M is the number of constraints and N is number of variables

+      
Linear inequality constraint matrix, specified as a matrix of double. A represents the linear coefficients in the constraints A*x ≤ b. A has size M-by-N, where M is the number of constraints and N is number of variables

    
b :
-      
Linear inequality constraint vector, specified as a vector of doubles. b represents the constant vector in the constraints A*x ≤ b. b has length M, where A is M-by-N

+      
Linear inequality constraint vector, specified as a vector of double. b represents the constant vector in the constraints A*x ≤ b. b has length M, where A is M-by-N

    
Aeq :
-      
Linear equality constraint matrix, specified as a matrix of doubles. Aeq represents the linear coefficients in the constraints Aeq*x = beq. Aeq has size Meq-by-N, where Meq is the number of constraints and N is number of variables

+      
Linear equality constraint matrix, specified as a matrix of double. Aeq represents the linear coefficients in the constraints Aeq*x = beq. Aeq has size Meq-by-N, where Meq is the number of constraints and N is number of variables

    
beq :
-      
Linear equality constraint vector, specified as a vector of doubles. beq represents the constant vector in the constraints Aeq*x = beq. beq has length Meq, where Aeq is Meq-by-N.

+      
Linear equality constraint vector, specified as a vector of double. beq represents the constant vector in the constraints Aeq*x = beq. beq has length Meq, where Aeq is Meq-by-N.

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

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

    
ub :
-      
Upper bounds, specified as a vector or array of doubles. ub represents the upper bounds elementwise in lb ≤ x ≤ ub.

+      
Upper bounds, specified as a vector or array of double. ub represents the upper bounds elementwise in lb ≤ x ≤ ub.

    
options :
       
a list containing the the parameters to be set.

    
xopt :
       
a vector of double, the computed solution of the optimization problem

    
fopt :
-      
a doubles, the function value at x

+      
a double, the function value at x

    
status :
       
status flag from symphony.

    
output :
@@ -80,7 +80,7 @@ find the minimum or maximum of f(x) such that

 
 
Examples

    
// Objective function
-c = [350*5,330*3,310*4,280*6,500,450,400,100]';
+C = [350*5,330*3,310*4,280*6,500,450,400,100]';
 // Lower Bound of variable
 lb = repmat(0,1,8);
 // Upper Bound of variables
@@ -106,7 +106,7 @@ find the minimum or maximum of f(x) such that

 // st   sum{j=1,...,n} r(i,j)x(j) <= b(i)       i=1,...,m
 //                     x(j)=0 or 1
 // The function to be maximize i.e. P(j)
-objCoef = -1*[   504 803 667 1103 834 585 811 856 690 832 846 813 868 793 ..
+C = -1*[   504 803 667 1103 834 585 811 856 690 832 846 813 868 793 ..
 825 1002 860 615 540 797 616 660 707 866 647 746 1006 608 ..
 877 900 573 788 484 853 942 630 591 630 640 1169 932 1034 ..
 957 798 669 625 467 1051 552 717 654 388 559 555 1104 783 ..
@@ -114,7 +114,7 @@ find the minimum or maximum of f(x) such that

 510 671 575 740 510 675 996 636 826 1022 1140 654 909 799 ..
 1162 653 814 625 599 476 767 954 906 904 649 873 565 853 1008 632]';
 //Constraint Matrix
-conMatrix = [   //Constraint 1
+A = [   //Constraint 1
 42 41 523 215 819 551 69 193 582 375 367 478 162 898 ..
 550 553 298 577 493 183 260 224 852 394 958 282 402 604 ..
 164 308 218 61 273 772 191 117 276 877 415 873 902 465 ..
@@ -156,7 +156,7 @@ find the minimum or maximum of f(x) such that

 893 160 785 311 417 748 375 362 617 553 474 915 457 261 350 635 ;
 ];
 nbVar = size(objCoef,1)
-conUB=[11927 13727 11551 13056 13460 ];
+b=[11927 13727 11551 13056 13460 ];
 // Lower Bound of variables
 lb = repmat(0,1,nbVar)
 // Upper Bound of variables
@@ -175,7 +175,7 @@ find the minimum or maximum of f(x) such that

 // Optimal value
 fopt = [ 24381 ]
 // Calling Symphony
-[x,f,status,output] = symphonymat(objCoef,intcon,conMatrix,conUB,[],[],lb,ub,options);

+[x,f,status,output] = symphonymat(C,intcon,A,b,[],[],lb,ub,options);

Authors

-- cgit