Skip to content

Commit 6d7e3a7

Browse files
committed
Removed debugZeroBasicDuals and reverted call to lpsolver.run() in HighsLpRelaxation.cpp
1 parent 6b854ba commit 6d7e3a7

File tree

4 files changed

+3
-14
lines changed

4 files changed

+3
-14
lines changed

highs/mip/HighsLpRelaxation.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,9 @@ HighsLpRelaxation::Status HighsLpRelaxation::run(bool resolve_on_error) {
11511151
use_simplex = true;
11521152
}
11531153
}
1154-
if (use_simplex) callstatus = lpsolver.run();
1154+
if (use_simplex) {
1155+
callstatus = lpsolver.run();
1156+
}
11551157
// Revert the value of lpsolver.options_.solver
11561158
lpsolver.setOptionValue("solver", solver);
11571159
if (!mipsolver.submip) {

highs/simplex/HEkk.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3632,8 +3632,6 @@ HighsStatus HEkk::returnFromSolve(const HighsStatus return_status) {
36323632
} else {
36333633
return_dual_solution_status_ = kSolutionStatusInfeasible;
36343634
}
3635-
// Basic duals are nonzero
3636-
// assert(debugZeroBasicDuals());
36373635
assert(debugNoShiftsOrPerturbations());
36383636
computePrimalObjectiveValue();
36393637
if (!options_->log_dev_level) {

highs/simplex/HEkk.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,6 @@ class HEkk {
409409
HighsDebugStatus debugSimplexDualInfeasible(const std::string message,
410410
const bool force_report = false);
411411
HighsDebugStatus debugComputeDual(const bool initialise = false) const;
412-
bool debugZeroBasicDuals() const;
413412
bool debugNoShiftsOrPerturbations() const;
414413
friend class HEkkPrimal;
415414
friend class HEkkDual;

highs/simplex/HEkkDebug.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,16 +1694,6 @@ HighsDebugStatus HEkk::debugSimplexDualInfeasible(const std::string message,
16941694
return HighsDebugStatus::kOk;
16951695
}
16961696

1697-
bool HEkk::debugZeroBasicDuals() const {
1698-
const std::vector<double> dual = this->info_.workDual_;
1699-
const std::vector<HighsInt> basis = this->basis_.basicIndex_;
1700-
for (HighsInt iRow = 0; iRow < this->lp_.num_row_; iRow++)
1701-
if (dual[basis[iRow]]) {
1702-
return false;
1703-
}
1704-
return true;
1705-
}
1706-
17071697
bool HEkk::debugNoShiftsOrPerturbations() const {
17081698
switch (model_status_) {
17091699
case HighsModelStatus::kOptimal: {

0 commit comments

Comments
 (0)