Skip to content

Commit 7679e11

Browse files
committed
Moved pdlp_iteration_count back to where it was inserted, breaking the C API
1 parent ebd456a commit 7679e11

File tree

2 files changed

+10
-34
lines changed

2 files changed

+10
-34
lines changed

FEATURES.md

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,17 @@
11
## Build changes
22

3-
### HiGHS on nixpkgs
4-
5-
HiGHS now has a `flake.nix` to build the binary, allowing `nix` users to try it out
6-
7-
### Python build update
8-
9-
Highspy with setuptools from v1.7.0 only worked on Python 3.12
10-
For v1.7.0 we have dropped setuptools and switched to scikit-build-core
11-
12-
### Windows versions
13-
14-
Fixed version info of shared library
15-
Added version info to executable
16-
173
## Code changes
184

19-
Inserting `pdlp_iteration_count` into various structs (for v1.7.0) breaks the C API, so it has been moved to the end of those structs
20-
21-
`setBasis` has been added to `highspy`
22-
23-
`writePresolvedModel` has been added
24-
25-
Saved MIP solution pool is populated when presolve reduces MIP to empty
26-
27-
Compilation date has been removed improve build reproducibility. Methods to print compilation dates are deprecated
28-
29-
Logging and error return when user-supplied solution or basis is rejected on vector dimensions
30-
31-
Memory allocation errors in presolve are caught and `Highs::run()` returns `HighsStatus::kError` with `model_status_ = HighsModelStatus::kMemoryLimit`
32-
33-
QP solver logging is now neater and quieter
34-
35-
Any Hessian for the incumbent model is modified with zero entries when adding columns to the model, and rows/columns are removed when columns are deleted from the model.
5+
The accessor function Highs_getCallbackDataOutItem in the C API means
6+
that `pdlp_iteration_count` can be moved back to where it was inserted
7+
into the `HighsCallbackDataOut` struct in v1.7.0, which broke the C
8+
API. This fixes #1812
369

37-
Minor bug fix in MIP presolve
10+
Some duplicate code has been eliminated from the MIP solver, and
11+
modifications made to eliminate compiler warnings
3812

39-
QP solver will now hot start given a basis and solution
13+
Declaration of the (deprecated) method `char* highsCompilationDate()`
14+
has been corrected
4015

16+
Fixed bug when describing integrality status during the human-readable solution write
4117

src/lp_data/HighsCallbackStruct.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ typedef struct {
2929
double running_time;
3030
HighsInt simplex_iteration_count;
3131
HighsInt ipm_iteration_count;
32+
HighsInt pdlp_iteration_count;
3233
double objective_function_value;
3334
int64_t mip_node_count;
3435
double mip_primal_bound;
@@ -43,7 +44,6 @@ typedef struct {
4344
double* cutpool_value;
4445
double* cutpool_lower;
4546
double* cutpool_upper;
46-
HighsInt pdlp_iteration_count;
4747
} HighsCallbackDataOut;
4848

4949
typedef struct {

0 commit comments

Comments
 (0)