Fix incorrect logic

Author: Opt-Mucca

highs/mip/HighsMipSolver.cpp

@@ -327,6 +327,8 @@ void HighsMipSolver::run() {
                                     options_mip_->mip_pool_soft_limit, i + 1);
     mipdata_->conflictpools.emplace_back(5 * options_mip_->mip_pool_age_limit,
                                          options_mip_->mip_pool_soft_limit);
+    mipdata_->domains.back().addCutpool(mipdata_->cutpools.back());
+    mipdata_->domains.back().addConflictPool(mipdata_->conflictpools.back());
     mipdata_->workers.emplace_back(
         *this, &mipdata_->lps.back(), &mipdata_->domains.back(),
         &mipdata_->cutpools.back(), &mipdata_->conflictpools.back());

highs/mip/HighsMipWorker.cpp

@@ -29,8 +29,8 @@ HighsMipWorker::HighsMipWorker(const HighsMipSolver& mipsolver__,
   sepa_ptr_ = std::unique_ptr<HighsSeparation>(new HighsSeparation(*this));
 
   // add local cutpool
-  search_ptr_->getLocalDomain().addCutpool(*cutpool_);
-  search_ptr_->getLocalDomain().addConflictPool(*conflictpool_);
+  // search_ptr_->getLocalDomain().addCutpool(*cutpool_);
+  // search_ptr_->getLocalDomain().addConflictPool(*conflictpool_);
 
   search_ptr_->setLpRelaxation(lprelaxation_);
   sepa_ptr_->setLpRelaxation(lprelaxation_);

highs/mip/HighsSearch.cpp

@@ -1988,7 +1988,7 @@ void HighsSearch::solveDepthFirst(int64_t maxbacktracks) {
 double HighsSearch::getFeasTol() const { return mipsolver.mipdata_->feastol; }
 
 double HighsSearch::getUpperLimit() const {
-  if (mipsolver.mipdata_->parallelLockActive()) {
+  if (!mipsolver.mipdata_->parallelLockActive()) {
     return mipsolver.mipdata_->upper_limit;
   } else {
     return mipworker.upper_limit;
@@ -1998,7 +1998,7 @@ double HighsSearch::getUpperLimit() const {
 double HighsSearch::getEpsilon() const { return mipsolver.mipdata_->epsilon; }
 
 double HighsSearch::getOptimalityLimit() const {
-  if (mipsolver.mipdata_->parallelLockActive()) {
+  if (!mipsolver.mipdata_->parallelLockActive()) {
     return mipsolver.mipdata_->optimality_limit;
   } else {
     return mipworker.optimality_limit;