Skip to content

Commit

Permalink
Updated docstring
Browse files Browse the repository at this point in the history
Added note that quadprog only works <=3.10
  • Loading branch information
HKaras committed Jul 27, 2023
1 parent d64286d commit 773b788
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion deerlab/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -1569,7 +1569,7 @@ def fit(model_, y, *constants, par0=None, penalties=None, bootstrap=0, noiselvl=
nnlsSolver : string, optional
Solver used to solve a non-negative least-squares problem (if applicable):
* ``'qp'`` - Optimization of the NNLS problem using the ``quadprog`` package.
* ``'qp'`` - Optimization of the NNLS problem using the ``quadprog`` package. Only Python <= 3.10.
* ``'cvx'`` - Optimization of the NNLS problem using the ``cvxopt`` package.
* ``'fnnls'`` - Optimization using the fast NNLS algorithm.
Expand Down
2 changes: 1 addition & 1 deletion deerlab/solvers.py
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ def snlls(y, Amodel, par0=None, lb=None, ub=None, lbl=None, ubl=None, nnlsSolver
nnlsSolver : string, optional
Solver used to solve a non-negative least-squares problem (if applicable):
* ``'qp'`` - Optimization of the NNLS problem using the ``quadprog`` package.
* ``'qp'`` - Optimization of the NNLS problem using the ``quadprog`` package. Only Python <= 3.10.
* ``'cvx'`` - Optimization of the NNLS problem using the ``cvxopt`` package.
* ``'fnnls'`` - Optimization using the fast NNLS algorithm.
Expand Down

0 comments on commit 773b788

Please sign in to comment.