Skip to content

Commit ab173ee

Browse files
committed
(Issue #291) Improve spsolver info in docstrings.
1 parent 8ae1a8f commit ab173ee

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

pounders/m/create_trsp_solver.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
% ----- IDENTIFY DESIRED SOLVER
5050
if spsolver == TRSP_SOLVER_SIMPLE
51-
printf("WARNING: The simple TRSP solver should only be used for testing or debugging");
51+
disp("WARNING: The simple TRSP solver should only be used for testing or debugging");
5252
solver = @bqmin_wrapper;
5353
elseif spsolver == TRSP_SOLVER_MINQ5
5454
check_minq_installation(5);

pounders/m/pounders.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@
3939
% * 1 - Debugging level of output to screen
4040
% * 2 - More verbose screen output
4141
%
42-
% * **spsolver** - Trust-region subproblem solver flag (default is 2, not recommended to change)
42+
% * **spsolver** - Trust-region subproblem solver flag
43+
%
44+
% * 2 - Arnold Neumaier's minq5 solver (default and recommended)
45+
% * 3 - Arnold Neumaier's minq8 solver
46+
%
4347
% * **hfun** - Outer function :math:`\hfun` that maps given
4448
% :math:`\Ffun(\psp)` to scalars for minimization (default is
4549
% sum-of-squares that yields :math:`f`.)

pounders/py/pounders.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ def pounders(Ffun, X_0, n, nf_max, g_tol, delta_0, m, Low, Upp, Prior=None, Opti
6969
* 1 - Debugging level of output to screen
7070
* 2 - More verbose screen output
7171
72-
* **spsolver** - Trust-region subproblem solver flag (default is 2, not recommended to change)
72+
* **spsolver** - Trust-region subproblem solver flag
73+
74+
* 2 - Arnold Neumaier's minq5 solver (default)
75+
7376
* **hfun** - Outer function :math:`\hfun` that maps given
7477
:math:`\Ffun(\psp)` to scalars for minimization (default is
7578
sum-of-squares that yields :math:`f`)

0 commit comments

Comments
 (0)