Skip to content

Commit

Permalink
Merge 444fd81 into 54135cb
Browse files Browse the repository at this point in the history
  • Loading branch information
bodono committed Feb 27, 2022
2 parents 54135cb + 444fd81 commit c9c7d7b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions docs/src/api/settings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ They are set in the :ref:`ScsSettings <ScsSettings>` struct.
- :code:`scs_int`
- How much memory to use for Anderson acceleration. More memory requires more time to compute but can give more reliable steps. :code:`0` disables it. See :ref:`acceleration`.
- :math:`\mathbf{N}`
- 0
- 10
* - :code:`acceleration_interval`
- :code:`scs_int`
- Run Anderson acceleration every this number of iterations. See :ref:`acceleration`.
- Run Anderson acceleration every :code:`acceleration_interval` iterations. See :ref:`acceleration`.
- :math:`\mathbf{N}`
- 1
- 10
* - :code:`write_data_filename`
- :code:`char *`
- If this is set the problem data is dumped to this filename.
Expand Down
5 changes: 3 additions & 2 deletions include/glbopts.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extern "C" {
#define SCS(x) _scs_##x
#endif

/* SCS VERSION NUMBER ---------------------------------------------- */
/* SCS VERSION NUMBER ---------------------------------------------- */
/* string literals automatically null-terminated */
#define SCS_VERSION ("3.2.0")

Expand All @@ -21,7 +21,8 @@ extern "C" {
#define VERBOSITY (0)
#endif

/* DEFAULT SOLVER PARAMETERS AND SETTINGS -------------------------- */
/* DEFAULT SOLVER PARAMETERS AND SETTINGS -------------------------- */
/* If you update any of these you must update the documentation manually */
#define MAX_ITERS (100000)
#define EPS_REL (1E-4)
#define EPS_ABS (1E-4)
Expand Down

0 comments on commit c9c7d7b

Please sign in to comment.