Skip to content

Commit

Permalink
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into cutG…
Browse files Browse the repository at this point in the history
…enInit
  • Loading branch information
fwesselm committed Jan 15, 2025
2 parents b9fbc22 + 584cea0 commit 120ad1c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
6 changes: 2 additions & 4 deletions src/presolve/HPresolve.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6307,8 +6307,7 @@ void HPresolve::debug(const HighsLp& lp, const HighsOptions& options) {

sol = reducedsol;
basis = reducedbasis;
postsolve_stack.undoUntil(options, flagRow, flagCol, sol, basis,
tmp.numReductions());
postsolve_stack.undoUntil(options, sol, basis, tmp.numReductions());

HighsBasis temp_basis;
HighsSolution temp_sol;
Expand Down Expand Up @@ -6354,8 +6353,7 @@ void HPresolve::debug(const HighsLp& lp, const HighsOptions& options) {
ARstart, ARindex, ARvalue);
sol = reducedsol;
basis = reducedbasis;
postsolve_stack.undoUntil(options, flagRow, flagCol, sol, basis,
reductionLim);
postsolve_stack.undoUntil(options, sol, basis, reductionLim);
calculateRowValuesQuad(model, sol);
kktinfo = dev_kkt_check::initInfo();
Expand Down
4 changes: 1 addition & 3 deletions src/presolve/HighsPostsolveStack.h
Original file line number Diff line number Diff line change
Expand Up @@ -784,9 +784,7 @@ class HighsPostsolveStack {
*/

// Only used for debugging
void undoUntil(const HighsOptions& options,
const std::vector<HighsInt>& flagRow,
const std::vector<HighsInt>& flagCol, HighsSolution& solution,
void undoUntil(const HighsOptions& options, HighsSolution& solution,
HighsBasis& basis, size_t numReductions) {
reductionValues.resetPosition();

Expand Down

0 comments on commit 120ad1c

Please sign in to comment.