Skip to content

Commit 58d05c3

Browse files
committed
Remove unnecessary debug solution resetdomains
1 parent d828de6 commit 58d05c3

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

highs/mip/HighsMipSolver.cpp

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,8 @@ void HighsMipSolver::run() {
345345
&mipdata_->cutpools.back(), &mipdata_->conflictpools.back());
346346
mipdata_->lps.back().setMipWorker(mipdata_->workers.back());
347347
mipdata_->lp.notifyCutPoolsLpCopied(1);
348+
mipdata_->debugSolution.registerDomain(
349+
mipdata_->workers.back().search_ptr_->getLocalDomain());
348350
};
349351

350352
auto resetGlobalDomain = [&](bool force = false) -> void {
@@ -697,10 +699,6 @@ void HighsMipSolver::run() {
697699
flush[i], infeasible[i]);
698700
});
699701
} else {
700-
mipdata_->debugSolution.resetDomain(
701-
mipdata_->workers[search_indices[i]].search_ptr_->getLocalDomain());
702-
mipdata_->debugSolution.resetDomain(
703-
mipdata_->workers[search_indices[i]].search_ptr_->getLocalDomain());
704702
doHandlePrunedNodes(search_indices[i], mipdata_->parallelLockActive(),
705703
flush[i], infeasible[i]);
706704
}
@@ -784,10 +782,6 @@ void HighsMipSolver::run() {
784782
mipdata_->workers[i].search_ptr_->getLocalDomain());
785783
});
786784
} else {
787-
mipdata_->debugSolution.resetDomain(
788-
mipdata_->workers[i].search_ptr_->getLocalDomain());
789-
mipdata_->debugSolution.resetDomain(
790-
mipdata_->workers[i].search_ptr_->getLocalDomain());
791785
mipdata_->workers[i].sepa_ptr_->separate(
792786
mipdata_->workers[i].search_ptr_->getLocalDomain());
793787
}
@@ -896,10 +890,6 @@ void HighsMipSolver::run() {
896890
!options_mip_->mip_search_simulate_concurrency) {
897891
tg.spawn([&, i]() { doRunHeuristics(mipdata_->workers[i]); });
898892
} else {
899-
mipdata_->debugSolution.resetDomain(
900-
mipdata_->workers[i].search_ptr_->getLocalDomain());
901-
mipdata_->debugSolution.resetDomain(
902-
mipdata_->workers[i].search_ptr_->getLocalDomain());
903893
doRunHeuristics(mipdata_->workers[i]);
904894
}
905895
}
@@ -933,10 +923,6 @@ void HighsMipSolver::run() {
933923
mipdata_->workers[i].search_ptr_->currentNodePruned()) {
934924
dive_times[i] = -1;
935925
} else {
936-
mipdata_->debugSolution.resetDomain(
937-
mipdata_->workers[i].search_ptr_->getLocalDomain());
938-
mipdata_->debugSolution.registerDomain(
939-
mipdata_->workers[i].search_ptr_->getLocalDomain());
940926
dive_results[i] = mipdata_->workers[i].search_ptr_->dive();
941927
dive_times[i] += analysis_.mipTimerRead(kMipClockNodeSearch);
942928
}
@@ -946,10 +932,6 @@ void HighsMipSolver::run() {
946932
mipdata_->workers[i].search_ptr_->currentNodePruned()) {
947933
dive_times[i] = -1;
948934
} else {
949-
mipdata_->debugSolution.resetDomain(
950-
mipdata_->workers[i].search_ptr_->getLocalDomain());
951-
mipdata_->debugSolution.resetDomain(
952-
mipdata_->workers[i].search_ptr_->getLocalDomain());
953935
dive_results[i] = mipdata_->workers[i].search_ptr_->dive();
954936
dive_times[i] += analysis_.mipTimerRead(kMipClockNodeSearch);
955937
}

0 commit comments

Comments
 (0)