Skip to content

Commit 391e477

Browse files
committed
formatting and comments
1 parent d2a654f commit 391e477

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

highs/mip/HighsDomain.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2060,8 +2060,8 @@ void HighsDomain::changeBound(HighsDomainChange boundchg, Reason reason) {
20602060
// tried to only modify cliquetable before the dive
20612061
// but when I try the condition below breaks lseu and I don't know why yet
20622062
// if (mipsolver->mipdata_->workers.size() <= 1)
2063-
mipsolver->mipdata_->cliquetable.addImplications(
2064-
*this, boundchg.column, col_lower_[boundchg.column] > 0.5);
2063+
mipsolver->mipdata_->cliquetable.addImplications(
2064+
*this, boundchg.column, col_lower_[boundchg.column] > 0.5);
20652065
}
20662066

20672067
void HighsDomain::setDomainChangeStack(

highs/mip/HighsMipSolver.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ void HighsMipSolver::run() {
324324
size_t plungestart = mipdata_->num_nodes;
325325
bool limit_reached = false;
326326

327+
// atm heuristics in the dive break lseu debug64
327328
// bool considerHeuristics = true;
328329
bool considerHeuristics = false;
329330

highs/mip/HighsMipWorker.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,28 @@ HighsMipWorker::HighsMipWorker(const HighsMipSolver& mipsolver__,
4040
search_ptr_->getLocalDomain().addConflictPool(conflictpool_);
4141

4242
// printf(
43-
// "lprelax_ parameter address in constructor of mipworker %p, %d columns, "
44-
// "and "
43+
// "lprelax_ parameter address in constructor of mipworker %p, %d columns,
44+
// " "and "
4545
// "%d rows\n",
4646
// (void*)&lprelax_, int(lprelax_.getLpSolver().getNumCol()),
4747
// int(lprelax_.getLpSolver().getNumRow()));
4848

4949
// printf(
50-
// "lprelaxation_ address in constructor of mipworker %p, %d columns, and "
50+
// "lprelaxation_ address in constructor of mipworker %p, %d columns, and
51+
// "
5152
// "%d rows\n",
5253
// (void*)&lprelaxation_, int(lprelaxation_.getLpSolver().getNumCol()),
5354
// int(lprelaxation_.getLpSolver().getNumRow()));
5455

5556
// HighsSearch has its own relaxation initialized no nullptr.
57+
5658
search_ptr_->setLpRelaxation(&lprelaxation_);
5759

5860
// printf(
5961
// "Search has lp member in constructor of mipworker with address %p, %d "
6062
// "columns, and %d rows\n",
61-
// (void*)&search_ptr_->lp, int(search_ptr_->lp->getLpSolver().getNumCol()),
63+
// (void*)&search_ptr_->lp,
64+
// int(search_ptr_->lp->getLpSolver().getNumCol()),
6265
// int(search_ptr_->lp->getLpSolver().getNumRow()));
6366
}
6467

0 commit comments

Comments
 (0)