Skip to content

Commit

Permalink
Each HighsMipWorker has a distinct HighsLpRelaxation instance, but th…
Browse files Browse the repository at this point in the history
…ey are not populated
  • Loading branch information
jajhall committed Feb 11, 2025
1 parent a3a3174 commit efbae94
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion src/mip/HighsMipSolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,12 @@ void HighsMipSolver::run() {

concurrent_searches.push_back(&(mipworkers[iSearch].getSearch()));
}

for (HighsInt iSearch = 0; iSearch < mip_search_concurrency; iSearch++) {
printf("Search %d has LP relaxation with address %p, %d columns, and %d rows\n",
int(iSearch), (void*)&concurrent_searches[iSearch]->mipworker.lprelaxation_,
int(concurrent_searches[iSearch]->mipworker.lprelaxation_.getLpSolver().getNumCol()),
int(concurrent_searches[iSearch]->mipworker.lprelaxation_.getLpSolver().getNumRow()));
}
// assert(worker_mipsolvers.size() == num_worker);
assert(mipworkers.size() == num_worker);

Expand Down
1 change: 1 addition & 0 deletions src/mip/HighsMipWorker.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class HighsSearch;

class HighsMipWorker {
const HighsMipSolver& mipsolver_;
public: // Temporary so HighsMipWorker can be explored in other classes

HighsLpRelaxation lprelaxation_;
HighsCliqueTable cliquetable_;
Expand Down
2 changes: 0 additions & 2 deletions src/mip/HighsSearch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2019,8 +2019,6 @@ void HighsSearch::dive(const HighsInt search_id) {

// set iteration limit for each lp solve during the dive to 10 times the
// average nodes
printf("HighsSearch::dive(%d): Address of mipsolver.mipdata_->lp is %p\n",
int(search_id), (void*)&mipsolver.mipdata_->lp);
HighsInt iterlimit = 10 * std::max(mipsolver.mipdata_->lp.getAvgSolveIters(),
mipsolver.mipdata_->avgrootlpiters);
iterlimit =
Expand Down
1 change: 1 addition & 0 deletions src/mip/HighsSearch.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class HighsSearch {
// const HighsMipSolver& mipsolver;

// replace HighsMipSolver with HighsMipWorker
public: // Temporary so HighsSearch can be explored in other classes
HighsMipWorker& mipworker;
// points to mipworker.getMipSolver() for minimal changes.
const HighsMipSolver& mipsolver;
Expand Down

0 comments on commit efbae94

Please sign in to comment.