diff options
| author | OR-FOSSEE | 2015-10-30 18:44:18 +0530 |
|---|---|---|
| committer | OR-FOSSEE | 2015-10-30 18:44:18 +0530 |
| commit | 5bc71c7c5b18ca0e57fc90c9a9c8dda5773c71f0 (patch) | |
| tree | b9d99d4784c6e6317d67fd9f43baf7f5198a1f53 | |
| parent | eb054c02e76fa28638b595865f5eda52277b70be (diff) | |
| download | FOSSEE-Optimization-toolbox-5bc71c7c5b18ca0e57fc90c9a9c8dda5773c71f0.tar.gz FOSSEE-Optimization-toolbox-5bc71c7c5b18ca0e57fc90c9a9c8dda5773c71f0.tar.bz2 FOSSEE-Optimization-toolbox-5bc71c7c5b18ca0e57fc90c9a9c8dda5773c71f0.zip | |
Update qpipopt.sci
| -rw-r--r-- | macros/qpipopt.sci | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/macros/qpipopt.sci b/macros/qpipopt.sci index efcca01..a1d094e 100644 --- a/macros/qpipopt.sci +++ b/macros/qpipopt.sci @@ -21,11 +21,7 @@ function [xopt,fopt,exitflag,output,lambda] = qpipopt (varargin) // Parameters // nbVar : a 1 x 1 matrix of doubles, number of variables // nbCon : a 1 x 1 matrix of doubles, number of constraints -<<<<<<< HEAD // Q : a n x n symmetric matrix of doubles, where n is number of variables, represents coefficients of quadratic in the quadratic problem. -======= - // Q : a n x n matrix of doubles, where n is number of variables, represents coefficients of quadratic in the quadratic problem. ->>>>>>> c2679735a3443017e003ca095d0476bae2dd8e40 // p : a n x 1 matrix of doubles, where n is number of variables, represents coefficients of linear in the quadratic problem // 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. |