diff options
| author | Harpreet | 2015-10-26 15:54:12 +0530 |
|---|---|---|
| committer | Harpreet | 2015-10-26 15:54:12 +0530 |
| commit | eb054c02e76fa28638b595865f5eda52277b70be (patch) | |
| tree | 6758eac3ed3cbb09da8f66c7de4df36a8fb710aa | |
| parent | 1e82cbeeb97000ce243fb4ef6566d0b554473713 (diff) | |
| parent | c2679735a3443017e003ca095d0476bae2dd8e40 (diff) | |
| download | FOSSEE-Optimization-toolbox-eb054c02e76fa28638b595865f5eda52277b70be.tar.gz FOSSEE-Optimization-toolbox-eb054c02e76fa28638b595865f5eda52277b70be.tar.bz2 FOSSEE-Optimization-toolbox-eb054c02e76fa28638b595865f5eda52277b70be.zip | |
qp conflict resolved
| -rw-r--r-- | macros/qpipopt.sci | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/macros/qpipopt.sci b/macros/qpipopt.sci index a1d094e..efcca01 100644 --- a/macros/qpipopt.sci +++ b/macros/qpipopt.sci @@ -21,7 +21,11 @@ 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. |