From 436f0daf6e4f241b8fa582a943bad09ddc091f59 Mon Sep 17 00:00:00 2001 From: Harpreet Date: Fri, 11 Dec 2015 12:51:00 +0530 Subject: lsqnonneg added --- help/en_US/lsqlin.xml | 11 ++- help/en_US/lsqnonneg.xml | 102 ++++++++++++++++++++ help/en_US/master_help.xml | 2 + help/en_US/qpipopt.xml | 2 +- help/en_US/qpipoptmat.xml | 8 +- help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS | Bin 7351 -> 7489 bytes .../scilab_en_US_help/JavaHelpSearch/DOCS.TAB | Bin 850 -> 862 bytes .../en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS | Bin 266 -> 273 bytes .../scilab_en_US_help/JavaHelpSearch/POSITIONS | Bin 35734 -> 36150 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_lsqnonneg.xml_1.png | Bin 0 -> 1508 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/lsqlin.html | 17 ++-- help/en_US/scilab_en_US_help/lsqnonneg.html | 106 +++++++++++++++++++++ help/en_US/scilab_en_US_help/qpipopt.html | 6 +- help/en_US/scilab_en_US_help/qpipoptmat.html | 8 +- .../section_19f4f1e5726c01d683e8b82be0a7e910.html | 6 ++ help/en_US/scilab_en_US_help/symphony.html | 2 +- help/en_US/scilab_en_US_help/symphonymat.html | 12 ++- help/en_US/symphony.xml | 2 +- help/en_US/symphonymat.xml | 12 ++- 24 files changed, 268 insertions(+), 38 deletions(-) create mode 100644 help/en_US/lsqnonneg.xml create mode 100644 help/en_US/scilab_en_US_help/_LaTeX_lsqnonneg.xml_1.png create mode 100644 help/en_US/scilab_en_US_help/lsqnonneg.html (limited to 'help') diff --git a/help/en_US/lsqlin.xml b/help/en_US/lsqlin.xml index 92dbd91..1216bae 100644 --- a/help/en_US/lsqlin.xml +++ b/help/en_US/lsqlin.xml @@ -50,17 +50,19 @@ beq : a vector of doubles, represents the linear coefficients in the equality constraints LB : - a vector of doubles, where n is number of variables, contains lower bounds of the variables. + a vector of doubles, contains lower bounds of the variables. UB : - a vector of doubles, where n is number of variables, contains upper bounds of the variables. + a vector of doubles, contains upper bounds of the variables. x0 : a vector of doubles, 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. - fopt : - a double, the function value at x. + 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. exitflag : Integer identifying the reason the algorithm terminated. output : @@ -74,7 +76,6 @@ Description Search the minimum of a constrained linear least square problem specified by : -find the minimum of f(x) such that diff --git a/help/en_US/lsqnonneg.xml b/help/en_US/lsqnonneg.xml new file mode 100644 index 0000000..95c8da1 --- /dev/null +++ b/help/en_US/lsqnonneg.xml @@ -0,0 +1,102 @@ + + + + + + + + lsqnonneg + Solves nonnegative least-squares curve fitting problems. + + + + + Calling Sequence + + x = lsqnonneg(C,d) + x = lsqnonneg(C,d,param) + [xopt,resnorm,residual,exitflag,output,lambda] = lsqnonneg( ... ) + + + + + + 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. + 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. + xopt : + a vector of doubles, 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. + 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 + +Solves nonnegative least-squares curve fitting problems specified by : + + + +\begin{eqnarray} +&\mbox{min}_{x} +& 1/2||C*x - d||_2^2 \\ +& & x \geq 0 \\ +\end{eqnarray} + + + +We are calling IPOpt for solving the nonnegative least-squares curve fitting problems, IPOpt is a library written in C++. The code has been written by ​Andreas Wächter and ​Carl Laird. + + + + + + + Examples + + + + + Authors + + Harpreet Singh + + + diff --git a/help/en_US/master_help.xml b/help/en_US/master_help.xml index 05f5acd..999a2d7 100644 --- a/help/en_US/master_help.xml +++ b/help/en_US/master_help.xml @@ -2,6 +2,7 @@ + @@ -83,6 +84,7 @@ Symphony Toolbox &a3d4ec65684b561d91f7a255acd23f51c; +&aa4a031935f5eed6cfc8fc4a49823b00b; &a6b85f6e0c98751f20b68663a23cb4cd2; &a44928acec52adf395379e18fcff06730; &a8549a3935858ed104f4749ca2243456a; diff --git a/help/en_US/qpipopt.xml b/help/en_US/qpipopt.xml index 2edd0ec..c0756f8 100644 --- a/help/en_US/qpipopt.xml +++ b/help/en_US/qpipopt.xml @@ -46,7 +46,7 @@ LB : a vector of doubles, contains lower bounds of the variables. UB : - a vector of doubles, where n is number of variables, contains upper bounds of the variables. + a vector of doubles, contains upper bounds of the variables. conMatrix : a matrix of doubles, contains matrix representing the constraint matrix conLB : diff --git a/help/en_US/qpipoptmat.xml b/help/en_US/qpipoptmat.xml index 3c9e6a4..f3830f4 100644 --- a/help/en_US/qpipoptmat.xml +++ b/help/en_US/qpipoptmat.xml @@ -39,9 +39,9 @@ Parameters H : - a vector of doubles, where n is number of variables, represents coefficients of quadratic in the quadratic problem. + a symmetric matrix of doubles, represents coefficients of quadratic in the quadratic problem. f : - a vector of doubles, where n is number of variables, represents coefficients of linear in the quadratic problem + a vector of doubles, represents coefficients of linear in the quadratic problem A : a vector of doubles, represents the linear coefficients in the inequality constraints b : @@ -51,9 +51,9 @@ beq : a vector of doubles, represents the linear coefficients in the equality constraints LB : - a vector of doubles, where n is number of variables, contains lower bounds of the variables. + a vector of doubles, contains lower bounds of the variables. UB : - a vector of doubles, where n is number of variables, contains upper bounds of the variables. + a vector of doubles, contains upper bounds of the variables. x0 : a vector of doubles, contains initial guess of variables. param : diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS index d7917b0..2aa9c2c 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 1359fb5..954ffd9 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 ae82060..d5a0fd6 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 a0643a5..1fbf883 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 c32f6ae..93aea58 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=1413 id2=1 +TMAP bs=2048 rt=1 fl=-1 id1=1435 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 dd780c5..141985f 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_lsqnonneg.xml_1.png b/help/en_US/scilab_en_US_help/_LaTeX_lsqnonneg.xml_1.png new file mode 100644 index 0000000..b923eeb Binary files /dev/null and b/help/en_US/scilab_en_US_help/_LaTeX_lsqnonneg.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 af31f16..c942e96 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 @@ +
  • lsqnonneg — Solves nonnegative least-squares curve fitting problems.
    • + + + + +
  • qpipopt — Solves a linear quadratic problem.
    • diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm index 8950140..f046f8a 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 5cac88f..7722be3 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/lsqlin.html b/help/en_US/scilab_en_US_help/lsqlin.html index 96c6de1..bf5a259 100644 --- a/help/en_US/scilab_en_US_help/lsqlin.html +++ b/help/en_US/scilab_en_US_help/lsqlin.html @@ -20,7 +20,7 @@ - qpipopt >> + lsqnonneg >> @@ -58,17 +58,19 @@
    beq :

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

    LB : -

    a vector of doubles, where n is number of variables, contains lower bounds of the variables.

    +

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

    UB : -

    a vector of doubles, where n is number of variables, contains upper bounds of the variables.

    +

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

    x0 :

    a vector of doubles, 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.

    -
    fopt : -

    a double, the function value at x.

    +
    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.

    exitflag :

    Integer identifying the reason the algorithm terminated.

    output : @@ -77,8 +79,7 @@

    Structure containing the Lagrange multipliers at the solution x (separated by constraint type).

    Description

    -

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

    +

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

    We are calling IPOpt for solving the linear least square problem, IPOpt is a library written in C++. The code has been written by ​Andreas Wächter and ​Carl Laird.

    @@ -143,7 +144,7 @@ find the minimum of f(x) such that

    - qpipopt >> + lsqnonneg >> diff --git a/help/en_US/scilab_en_US_help/lsqnonneg.html b/help/en_US/scilab_en_US_help/lsqnonneg.html new file mode 100644 index 0000000..4f2f661 --- /dev/null +++ b/help/en_US/scilab_en_US_help/lsqnonneg.html @@ -0,0 +1,106 @@ + + + lsqnonneg + + + +
    + + + + +
    + << lsqlin + + + Symphony Toolbox + + + qpipopt >> + +
    +
    +
    + + + + Symphony Toolbox >> Symphony Toolbox > lsqnonneg + +

    +

    lsqnonneg

    +

    Solves nonnegative least-squares curve fitting problems.

    + + +

    Calling Sequence

    + 
    x = lsqnonneg(C,d)
+x = lsqnonneg(C,d,param)
+[xopt,resnorm,residual,exitflag,output,lambda] = lsqnonneg( ... )
    + +

    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.

    +
    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.

    +
    xopt : +

    a vector of doubles, 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.

    +
    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

    +

    Solves nonnegative least-squares curve fitting problems specified by :

    +

    +

    We are calling IPOpt for solving the nonnegative least-squares curve fitting problems, IPOpt is a library written in C++. The code has been written by ​Andreas Wächter and ​Carl Laird.

    +

    + +

    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];
+[xopt,resnorm,residual,exitflag,output,lambda] = lsqnonneg(C,d)
    + +

    Authors

    +
    • Harpreet Singh
    +
    + +
    + + + + + + +
    Report an issue
    + << lsqlin + + + Symphony Toolbox + + + qpipopt >> + +
    +
    +
    + + diff --git a/help/en_US/scilab_en_US_help/qpipopt.html b/help/en_US/scilab_en_US_help/qpipopt.html index c0e1b71..7588c1d 100644 --- a/help/en_US/scilab_en_US_help/qpipopt.html +++ b/help/en_US/scilab_en_US_help/qpipopt.html @@ -12,7 +12,7 @@
    - << lsqlin + << lsqnonneg @@ -54,7 +54,7 @@
    LB :

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

    UB : -

    a vector of doubles, where n is number of variables, contains upper bounds of the variables.

    +

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

    conMatrix :

    a matrix of doubles, contains matrix representing the constraint matrix

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

    Report an issue
    - << lsqlin + << lsqnonneg diff --git a/help/en_US/scilab_en_US_help/qpipoptmat.html b/help/en_US/scilab_en_US_help/qpipoptmat.html index 10cb590..e1d301a 100644 --- a/help/en_US/scilab_en_US_help/qpipoptmat.html +++ b/help/en_US/scilab_en_US_help/qpipoptmat.html @@ -47,9 +47,9 @@

    Parameters

    H : -

    a vector of doubles, where n is number of variables, represents coefficients of quadratic in the quadratic problem.

    +

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

    f : -

    a vector of doubles, where n is number of variables, represents coefficients of linear in the quadratic problem

    +

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

    A :

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

    b : @@ -59,9 +59,9 @@
    beq :

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

    LB : -

    a vector of doubles, where n is number of variables, contains lower bounds of the variables.

    +

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

    UB : -

    a vector of doubles, where n is number of variables, contains upper bounds of the variables.

    +

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

    x0 :

    a vector of doubles, contains initial guess of variables.

    param : 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 14e8136..7219261 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 @@ +
  • lsqnonneg — Solves nonnegative least-squares curve fitting problems.
    • + + + + +
  • qpipopt — Solves a linear quadratic problem.
    • diff --git a/help/en_US/scilab_en_US_help/symphony.html b/help/en_US/scilab_en_US_help/symphony.html index 48ea705..14e9118 100644 --- a/help/en_US/scilab_en_US_help/symphony.html +++ b/help/en_US/scilab_en_US_help/symphony.html @@ -48,7 +48,7 @@
    nbCon :

    a double, number of constraints.

    objCoeff : -

    a 1 x n matrix of doubles, where n is number of variables, represents coefficients of the variables in the objective.

    +

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

    isInt :

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

    LB : diff --git a/help/en_US/scilab_en_US_help/symphonymat.html b/help/en_US/scilab_en_US_help/symphonymat.html index b559c8a..2e89728 100644 --- a/help/en_US/scilab_en_US_help/symphonymat.html +++ b/help/en_US/scilab_en_US_help/symphonymat.html @@ -45,7 +45,7 @@

    Parameters

    f : -

    a vector of doubles, where n is number of variables, contains coefficients of the variables in the objective

    +

    a vector of doubles, 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 : @@ -63,9 +63,11 @@
    options :

    a list containing the the parameters to be set.

    xopt : -

    a 1xn matrix of doubles, the computed solution of the optimization problem

    +

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

    fopt : -

    a 1x1 matrix of doubles, the function value at x

    +

    a doubles, the function value at x

    +
    status : +

    status flag from symphony.

    output :

    The output data structure contains detailed informations about the optimization process.

    @@ -78,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
@@ -109,7 +111,7 @@ find the minimum or maximum of f(x) such that
    
 957 798 669 625 467 1051 552 717 654 388 559 555 1104 783 ..
 959 668 507 855 986 831 821 825 868 852 832 828 799 686 ..
 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]
+1162 653 814 625 599 476 767 954 906 904 649 873 565 853 1008 632]';
 //Constraint Matrix
 conMatrix = [   //Constraint 1
 42 41 523 215 819 551 69 193 582 375 367 478 162 898 ..
diff --git a/help/en_US/symphony.xml b/help/en_US/symphony.xml
index 972bfc1..a80f022 100644
--- a/help/en_US/symphony.xml
+++ b/help/en_US/symphony.xml
@@ -40,7 +40,7 @@
    nbCon :
        a double, number of constraints.
    objCoeff :
-       a 1 x n matrix of doubles, where n is number of variables, represents coefficients of the variables in the objective.
+       a vector of doubles, represents coefficients of the variables in the objective.
    isInt :
        a vector of boolean, represents wether a variable is constrained to be an integer.
    LB :
diff --git a/help/en_US/symphonymat.xml b/help/en_US/symphonymat.xml
index 1328167..881092b 100644
--- a/help/en_US/symphonymat.xml
+++ b/help/en_US/symphonymat.xml
@@ -37,7 +37,7 @@
    Parameters
    
    f :
-       a vector of doubles, where n is number of variables, contains coefficients of the variables in the objective
+       a vector of doubles, 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 :
@@ -55,9 +55,11 @@
    options :
        a list containing the the parameters to be set.
    xopt :
-       a 1xn matrix of doubles, the computed solution of the optimization problem
+       a vector of double, the computed solution of the optimization problem
    fopt :
-       a 1x1 matrix of doubles, the function value at x
+       a doubles, the function value at x
+   status :
+       status flag from symphony.
    output :
        The output data structure contains detailed informations about the optimization process.
    
@@ -91,7 +93,7 @@ We are calling SYMPHONY written in C by gateway files for the actual computation
    Examples