Skip to content

Commit 179793b

Browse files
committed
Merge remote-tracking branch 'origin/v10-minor'
2 parents 1c35047 + 7981145 commit 179793b

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

doc/xternal.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,11 @@
124124
* `cpx` | IBM ILOG CPLEX
125125
* `xprs` | FICO XPress
126126
* `grb` | Gurobi (version at least 7.0.2 required)
127-
* `clp` | CoinOR CLP (interface currently sometimes produces wrong results)
127+
* `clp` | COIN-OR CLP (interface currently sometimes produces wrong results)
128128
* `glop` | Google Glop (contained in OR-tools)
129129
* `msk` | Mosek (version at least 7.0.0 required)
130130
* `qsopt` | QSopt (experimental)
131+
* `highs` | HiGHS (beta, sometimes failing)
131132
* `none` | disables LP solving entirely (not recommended; only for technical reasons)
132133
*/
133134

@@ -345,6 +346,7 @@
345346
*
346347
* - @subpage md_INSTALL "Installation instructions"
347348
* - @subpage LPI "Available implementations of the LP solver interface"
349+
* - @subpage LPIEXACT "Available implementations of the exact LP solver interface"
348350
* - @subpage NLPISOLVERS "Available implementations of the NLP solver interface"
349351
* - @subpage INSTALL_APPLICATIONS_EXAMPLES "Installation of applications and examples"
350352
*/
@@ -7860,9 +7862,9 @@
78607862
*
78617863
* Exact solving mode requires \SCIP to be built with
78627864
*
7863-
* - GMP[https://gmplib.org/] for rational arithmetic in ZIMPL, SoPlex, SCIP, and PaPILO,
7864-
* - Boost[https://www.boost.org/] multiprecision library for rationals in SCIP (and PaPILO, if linked),
7865-
* - MPFR[https://www.mpfr.org/] for approximating rationals with floating-point numbers in SCIP,
7865+
* - [GMP](https://gmplib.org/) for rational arithmetic in ZIMPL, SoPlex, SCIP, and PaPILO,
7866+
* - [Boost](https://www.boost.org/) multiprecision library for rationals in SCIP (and PaPILO, if linked),
7867+
* - [MPFR](https://www.mpfr.org/) for approximating rationals with floating-point numbers in SCIP,
78667868
* - and an exact LP solver such as SoPlex.
78677869
*
78687870
* Enabling the exact solving mode is done by setting the parameter `exact/enable = TRUE` or calling the API method
@@ -7871,7 +7873,7 @@
78717873
*
78727874
* Optionally, the output of a certificate (also known as proof logging) can be enabled by specifying
78737875
* `certificate/filename`. The resulting certificate can be checked with the proof checker
7874-
* VIPR[https://github.com/scipopt/vipr] or a formally verified version in CakeML[https://cakeml.org/checkers.html].
7876+
* [VIPR](https://github.com/scipopt/vipr) or a formally verified version in [CakeML](https://cakeml.org/checkers.html).
78757877
* Note that certificate files are incomplete if cutting plane separation is enabled (as by default). In this case, the
78767878
* certificate needs to be completed using the `viprcomp` script prior to verification.
78777879
*

src/scip/scip_solvingstats.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4262,7 +4262,7 @@ void SCIPprintLPStatistics(
42624262

42634263
SCIP_CALL_ABORT( SCIPcheckStage(scip, "SCIPprintLPStatistics", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, FALSE) );
42644264

4265-
SCIPmessageFPrintInfo(scip->messagehdlr, file, "LP : Time Calls Iterations Iter/call Iter/sec Time-0-It Calls-0-It ItLimit\n");
4265+
SCIPmessageFPrintInfo(scip->messagehdlr, file, "LP : Time Calls Iterations Iter/call Iter/sec Time-0-It Calls-0-It\n");
42664266

42674267
SCIPmessageFPrintInfo(scip->messagehdlr, file, " primal LP : %10.2f %10" SCIP_LONGINT_FORMAT " %10" SCIP_LONGINT_FORMAT " %10.2f",
42684268
SCIPclockGetTime(scip->stat->primallptime),

0 commit comments

Comments
 (0)