diff options
| author | Harpreet | 2015-12-22 14:51:05 +0530 |
|---|---|---|
| committer | Harpreet | 2015-12-22 14:51:05 +0530 |
| commit | 79583a44468943fad22ba1de2dd25dd86f7be167 (patch) | |
| tree | 54db759a8f856424f0c2ebd7f5306ffb881afdac /macros/lsqnonneg.sci | |
| parent | e12c133c99beee5a8dd04d4f6e8c2d5e07148408 (diff) | |
| download | symphony-79583a44468943fad22ba1de2dd25dd86f7be167.tar.gz symphony-79583a44468943fad22ba1de2dd25dd86f7be167.tar.bz2 symphony-79583a44468943fad22ba1de2dd25dd86f7be167.zip | |
Bugs by prof fixed 2
Diffstat (limited to 'macros/lsqnonneg.sci')
| -rw-r--r-- | macros/lsqnonneg.sci | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/macros/lsqnonneg.sci b/macros/lsqnonneg.sci index 77e5e44..b8694b4 100644 --- a/macros/lsqnonneg.sci +++ b/macros/lsqnonneg.sci @@ -14,8 +14,8 @@ function [xopt,resnorm,residual,exitflag,output,lambda] = lsqnonneg (varargin) // Solves nonnegative least-squares curve fitting problems. // // Calling Sequence - // x = lsqnonneg(C,d) - // x = lsqnonneg(C,d,param) + // xopt = lsqnonneg(C,d) + // xopt = lsqnonneg(C,d,param) // [xopt,resnorm,residual,exitflag,output,lambda] = lsqnonneg( ... ) // // Parameters @@ -25,8 +25,8 @@ function [xopt,resnorm,residual,exitflag,output,lambda] = lsqnonneg (varargin) // 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). + // output : Structure containing information about the optimization. Right now it contains number of iteration. + // lambda : Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper and linear equality, inequality constraints. // // Description // Solves nonnegative least-squares curve fitting problems specified by : @@ -39,10 +39,10 @@ function [xopt,resnorm,residual,exitflag,output,lambda] = lsqnonneg (varargin) // \end{eqnarray} // </latex> // - // 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. + // We are calling IPOpt for solving the nonnegative least-squares curve fitting problems, IPOpt is a library written in C++. // // Examples - // A basic lsqnonneg problem + // // A basic lsqnonneg problem // C = [ // 0.0372 0.2869 // 0.6861 0.7071 @@ -54,7 +54,6 @@ function [xopt,resnorm,residual,exitflag,output,lambda] = lsqnonneg (varargin) // 0.0747 // 0.8405]; // [xopt,resnorm,residual,exitflag,output,lambda] = lsqnonneg(C,d) - // // Authors // Harpreet Singh |