Skip to content

Commit 9fbd004

Browse files
committed
reverse order of domain and pools
1 parent 6a7a45b commit 9fbd004

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

highs/mip/HighsMipSolver.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,15 @@ void HighsMipSolver::run() {
269269

270270
auto destroyOldWorkers = [&]() {
271271
if (mipdata_->workers.size() <= 1) return;
272+
while (mipdata_->domains.size() > 1) {
273+
mipdata_->domains.pop_back();
274+
}
272275
while (mipdata_->cutpools.size() > 1) {
273276
mipdata_->cutpools.pop_back();
274277
}
275278
while (mipdata_->conflictpools.size() > 1) {
276279
mipdata_->conflictpools.pop_back();
277280
}
278-
while (mipdata_->domains.size() > 1) {
279-
mipdata_->domains.pop_back();
280-
}
281281
while (mipdata_->lps.size() > 1) {
282282
mipdata_->lps.pop_back();
283283
}

highs/mip/HighsMipSolverData.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ HighsMipSolverData::HighsMipSolverData(HighsMipSolver& mipsolver)
2323
: mipsolver(mipsolver),
2424
lps(1, HighsLpRelaxation(mipsolver)),
2525
lp(lps.at(0)),
26-
domains(1, HighsDomain(mipsolver)),
27-
domain(domains.at(0)),
2826
cutpool(*cutpools.emplace(cutpools.end(), mipsolver.numCol(),
2927
mipsolver.options_mip_->mip_pool_age_limit,
3028
mipsolver.options_mip_->mip_pool_soft_limit,
@@ -33,6 +31,8 @@ HighsMipSolverData::HighsMipSolverData(HighsMipSolver& mipsolver)
3331
1, HighsConflictPool(5 * mipsolver.options_mip_->mip_pool_age_limit,
3432
mipsolver.options_mip_->mip_pool_soft_limit)),
3533
conflictPool(conflictpools.at(0)),
34+
domains(1, HighsDomain(mipsolver)),
35+
domain(domains.at(0)),
3636
pseudocost(),
3737
parallel_lock(false),
3838
heuristics(mipsolver),

highs/mip/HighsMipSolverData.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ struct HighsMipSolverData {
7575
std::deque<HighsLpRelaxation> lps;
7676
HighsLpRelaxation& lp;
7777
std::deque<HighsMipWorker> workers;
78-
std::deque<HighsDomain> domains;
79-
HighsDomain& domain;
8078
std::deque<HighsCutPool> cutpools;
8179
HighsCutPool& cutpool;
8280
std::deque<HighsConflictPool> conflictpools;
8381
HighsConflictPool& conflictPool;
82+
std::deque<HighsDomain> domains;
83+
HighsDomain& domain;
8484
std::deque<HighsPseudocost> pseudocosts;
8585
HighsPseudocost pseudocost;
8686
bool parallel_lock;

0 commit comments

Comments
 (0)