Skip to content

Commit

Permalink
Merge pull request #1698 from ERGO-Code/fix-1697
Browse files Browse the repository at this point in the history
Moved pdlp_iteration_count to last data member of HighsCallbackDataOut
  • Loading branch information
jajhall authored Mar 29, 2024
2 parents 426124a + 5c7575b commit 91f2687
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
14 changes: 11 additions & 3 deletions FEATURES.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
### Build changes

## HiGHS on nixpkgs

HiGHS now has a `flake.nix` to build the binary, allowing `nix` users to try it out

#### Python build update
## Python build update

Highspy with setuptools from v1.7.0 only worked on Python 3.12
For v1.7.0 we have dropped setuptools and switched to scikit-build-core

#### Windows versions
## Windows versions

Fixed version info of shared library
Added version info to executable
Added version info to executable

### Code changes

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


2 changes: 1 addition & 1 deletion src/lp_data/HighsCallbackStruct.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ typedef struct {
double running_time;
HighsInt simplex_iteration_count;
HighsInt ipm_iteration_count;
HighsInt pdlp_iteration_count;
double objective_function_value;
int64_t mip_node_count;
double mip_primal_bound;
Expand All @@ -40,6 +39,7 @@ typedef struct {
double* cutpool_value;
double* cutpool_lower;
double* cutpool_upper;
HighsInt pdlp_iteration_count;
} HighsCallbackDataOut;

typedef struct {
Expand Down

0 comments on commit 91f2687

Please sign in to comment.