Flip termination conditional in HighsMipSolver::cleanupSolve() in preparation for limiting termination by sub-MIPs

Author: jajhall

check/TestMipSolver.cpp

@@ -1038,13 +1038,13 @@ TEST_CASE("issue-2432", "[highs_test_mip_solver]") {
 
 TEST_CASE("mip-race", "[highs_test_mip_solver]") {
   const bool ci_test = true;  // false;//
-  const std::string model = ci_test ? "flugpl" : "fiball";
+  const std::string model = ci_test ? "rgn" : "fiball"; //flugpl
   // "neos-3381206-awhea";
   const std::string model_file =
       ci_test ? std::string(HIGHS_DIR) + "/check/instances/" + model + ".mps"
               : "/srv/miplib2017/" + model + ".mps.gz";
   Highs h;
-  if (ci_test) h.setOptionValue("output_flag", dev_run);
+  //  if (ci_test) h.setOptionValue("output_flag", dev_run);
   const HighsInt mip_race_concurrency = ci_test ? 2 : 4;
   h.setOptionValue("mip_race_concurrency", mip_race_concurrency);
   REQUIRE(h.readModel(model_file) == HighsStatus::kOk);

highs/mip/HighsMipSolver.cpp

@@ -302,6 +302,10 @@ void HighsMipSolver::run() {
 
           mipdata_->heuristics.flushStatistics();
           analysis_.mipTimerStop(kMipClockDivePrimalHeuristics);
+	  if (mipdata_->terminatorTerminated()) {
+	    cleanupSolve();
+	    return;
+	  }
         }
       }
 
@@ -694,21 +698,22 @@ void HighsMipSolver::run() {
 }
 
 void HighsMipSolver::cleanupSolve() {
-  if (!submip && mipdata_->terminatorActive()) {
+  if (mipdata_->terminatorActive()) {
     if (!mipdata_->terminatorTerminated()) {
-      // No other instance has terminated the MIP race, so terminate
-      // it
+      // No other instance has terminated, so terminate it
       highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
-                   "instance%d: terminate   %6.4f (MIP)\n",
+                   "instance%d: terminate   %6.4f (%sMIP)\n",
                    int(this->mipdata_->terminatorMyInstance()),
-                   this->timer_.read());
+                   this->timer_.read(),
+		   submip ? "sub-" : "");
       mipdata_->terminatorTerminate();
     } else {
       // Indicate that this instance has been interrupted
       highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
-                   "instance%d: terminated  %6.4f (MIP)\n",
+                   "instance%d: terminated  %6.4f (%sMIP)\n",
                    int(this->mipdata_->terminatorMyInstance()),
-                   this->timer_.read());
+                   this->timer_.read(),
+		   submip ? "sub-" : "");
       modelstatus_ = HighsModelStatus::kHighsInterrupt;
     }
     mipdata_->terminatorReport();

highs/mip/HighsMipSolverData.cpp

@@ -2420,17 +2420,19 @@ void HighsMipSolverData::evaluateRootNode() {
 bool HighsMipSolverData::checkLimits(int64_t nodeOffset) const {
   const HighsOptions& options = *mipsolver.options_mip_;
 
-  // MIP race may have terminated
-  if (!mipsolver.submip && terminatorActive()) {
+  // This MIP instance may have been terminated
+  if (terminatorActive()) {
     highsLogUser(options.log_options, HighsLogType::kInfo,
-                 "instance%d: terminated? %6.4f (MIP)\n",
+                 "instance%d: terminated? %6.4f (%sMIP)\n",
                  int(this->terminatorMyInstance()),
-                 this->mipsolver.timer_.read());
+                 this->mipsolver.timer_.read(),
+		 mipsolver.submip ? "sub-" : "");
     if (this->terminatorTerminated()) {
       highsLogUser(options.log_options, HighsLogType::kInfo,
-                   "instance%d: terminated  %6.4f (MIP)\n",
+                   "instance%d: terminated  %6.4f (%sMIP)\n",
                    int(this->terminatorMyInstance()),
-                   this->mipsolver.timer_.read());
+                   this->mipsolver.timer_.read(),
+		   mipsolver.submip ? "sub-" : "");
       return true;
     }
   }
@@ -2726,7 +2728,6 @@ HighsInt HighsMipSolverData::mipRaceNewSolution(const HighsInt instance,
 }
 
 void HighsMipSolverData::mipRaceReport() const {
-  assert(!mipsolver.submip);
   if (mipsolver.mip_race_.record) mipsolver.mip_race_.report();
 }
 

highs/mip/HighsPrimalHeuristics.cpp

@@ -145,6 +145,8 @@ bool HighsPrimalHeuristics::solveSubMip(
   // Initialise termination_status_ and propagate any terminator to
   // the sub-MIP
   submipsolver.initialiseTerminator(mipsolver);
+  printf("HighsPrimalHeuristics::solveSubMip: %d submipsolver.termination_status_ = %d\n",
+	 int(submipsolver.terminator_.my_instance), int(submipsolver.termination_status_));
   submipsolver.rootbasis = &basis;
   HighsPseudocostInitialization pscostinit(mipsolver.mipdata_->pseudocost, 1);
   submipsolver.pscostinit = &pscostinit;
@@ -165,10 +167,10 @@ bool HighsPrimalHeuristics::solveSubMip(
     assert(submipsolver.mipdata_);
   }
   if (submipsolver.termination_status_ != HighsModelStatus::kNotset) {
-    printf("HighsPrimalHeuristics::solveSubMip: termination status is %d\n", int(submipsolver.termination_status_));
+    printf("HighsPrimalHeuristics::solveSubMip: %d termination status is %d\n", 
+	 int(submipsolver.terminator_.my_instance), int(submipsolver.termination_status_));
     mipsolver.termination_status_ = submipsolver.termination_status_;
-    assert(111==333);
-    return;
+    return false;
   }
   if (submipsolver.mipdata_) {
     double numUnfixed = mipsolver.mipdata_->integral_cols.size() +
@@ -561,6 +563,7 @@ void HighsPrimalHeuristics::RENS(const std::vector<double>& tmp) {
                   500,  // std::max(50, int(0.05 *
                   // (mipsolver.mipdata_->num_leaves))),
                   200 + mipsolver.mipdata_->num_nodes / 20, 12);
+  if (mipsolver.mipdata_->terminatorTerminated()) return;
   if (!solve_sub_mip_return) {
     int64_t new_lp_iterations = lp_iterations + heur.getLocalLpIterations();
     if (new_lp_iterations + mipsolver.mipdata_->heuristic_lp_iterations >
@@ -853,6 +856,7 @@ void HighsPrimalHeuristics::RINS(const std::vector<double>& relaxationsol) {
                   500,  // std::max(50, int(0.05 *
                   // (mipsolver.mipdata_->num_leaves))),
                   200 + mipsolver.mipdata_->num_nodes / 20, 12);
+  if (mipsolver.mipdata_->terminatorTerminated()) return;
   if (!solve_sub_mip_return) {
     int64_t new_lp_iterations = lp_iterations + heur.getLocalLpIterations();
     if (new_lp_iterations + mipsolver.mipdata_->heuristic_lp_iterations >