Skip to content

Commit

Permalink
Don't need HighsMipWorker main_worker(*this); HighsSearch master_sear…
Browse files Browse the repository at this point in the history
…ch{main_worker, mipdata_->pseudocost};
  • Loading branch information
jajhall committed Feb 10, 2025
1 parent a7a409e commit 9929f84
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/mip/HighsMipSolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,6 @@ void HighsMipSolver::run() {
const HighsInt mip_search_concurrency = options_mip_->mip_search_concurrency;
const HighsInt num_worker = mip_search_concurrency - 1;

HighsMipWorker main_worker(*this);

// HighsSearch master_search{main_worker, mipdata_->pseudocost};

HighsSearch master_search{*this, mipdata_->pseudocost};

mipdata_->debugSolution.registerDomain(master_search.getLocalDomain());
Expand Down Expand Up @@ -373,6 +369,7 @@ void HighsMipSolver::run() {
return search.performed_dive_;
};

const bool multiple_dive = false;
// Perform concurrent dives
for (HighsInt iSearch = 0; iSearch < mip_search_concurrency; iSearch++) {
HighsSearch& search = *concurrent_searches[iSearch];
Expand Down Expand Up @@ -576,9 +573,10 @@ void HighsMipSolver::run() {
} // if (!submip && mipdata_->num_nodes >= nextCheck))

// Now perform the node search
const bool multiple_node_search = false;
for (HighsInt iSearch = 0; iSearch < mip_search_concurrency; iSearch++) {
if (iSearch > 0 && !multiple_node_search) continue;
HighsSearch& search = *concurrent_searches[iSearch];
if (!performedDive(search, iSearch)) continue;

// remove the iteration limit when installing a new node
// mipdata_->lp.setIterationLimit();
Expand Down

0 comments on commit 9929f84

Please sign in to comment.