diff --git a/src/mip/HighsMipSolver.cpp b/src/mip/HighsMipSolver.cpp index 59c83ed1ee..cddc40daca 100644 --- a/src/mip/HighsMipSolver.cpp +++ b/src/mip/HighsMipSolver.cpp @@ -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); diff --git a/src/mip/HighsMipWorker.h b/src/mip/HighsMipWorker.h index c968bd272f..d0a4b3586f 100644 --- a/src/mip/HighsMipWorker.h +++ b/src/mip/HighsMipWorker.h @@ -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_; diff --git a/src/mip/HighsSearch.cpp b/src/mip/HighsSearch.cpp index d0fa198def..33b4134329 100644 --- a/src/mip/HighsSearch.cpp +++ b/src/mip/HighsSearch.cpp @@ -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 = diff --git a/src/mip/HighsSearch.h b/src/mip/HighsSearch.h index f8d1d4e0d4..d9b24b5269 100644 --- a/src/mip/HighsSearch.h +++ b/src/mip/HighsSearch.h @@ -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;