Now termination is not performed by sub-MIPs, but they will act on a termination from a MIP solver

Author: jajhall

check/TestMipSolver.cpp

@@ -1049,11 +1049,13 @@ TEST_CASE("mip-race", "[highs_test_mip_solver]") {
   h.setOptionValue("mip_race_concurrency", mip_race_concurrency);
   REQUIRE(h.readModel(model_file) == HighsStatus::kOk);
   REQUIRE(h.run() == HighsStatus::kOk);
+  REQUIRE(h.getModelStatus() == HighsModelStatus::kOptimal);
 
   if (ci_test) {
     h.clearSolver();
     h.setOptionValue("mip_race_read_solutions", false);
     REQUIRE(h.run() == HighsStatus::kOk);
+    REQUIRE(h.getModelStatus() == HighsModelStatus::kOptimal);
   }
   h.resetGlobalScheduler(true);
 }

highs/mip/HighsMipSolver.cpp

@@ -699,22 +699,29 @@ void HighsMipSolver::run() {
 
 void HighsMipSolver::cleanupSolve() {
   if (mipdata_->terminatorActive()) {
-    if (!mipdata_->terminatorTerminated()) {
-      // No other instance has terminated, so terminate it
+    mipdata_->terminatorReport();
+    if (mipdata_->terminatorTerminated()) {
+      // Indicate that this instance has been interrupted
       highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
-                   "instance%d: terminate   %6.4f (%sMIP)\n",
+                   "instance%d: terminated  %6.4f (%sMIP)\n",
                    int(this->mipdata_->terminatorMyInstance()),
                    this->timer_.read(),
 		   submip ? "sub-" : "");
-      mipdata_->terminatorTerminate();
-    } else {
-      // Indicate that this instance has been interrupted
+      modelstatus_ = HighsModelStatus::kHighsInterrupt;
+    } else if (!submip) {
+      // When sub-MIPs call cleanupSolve(), they generally don't have
+      // a termination criterion for the whole MIP solver
+      //
+      // Possibly allow sub-MIPs to terminate if the time limit is
+      // reached
+      //
+      // No other instance has terminated, so terminate
       highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
-                   "instance%d: terminated  %6.4f (%sMIP)\n",
+                   "instance%d: terminate   %6.4f (%sMIP)\n",
                    int(this->mipdata_->terminatorMyInstance()),
                    this->timer_.read(),
 		   submip ? "sub-" : "");
-      modelstatus_ = HighsModelStatus::kHighsInterrupt;
+      mipdata_->terminatorTerminate();
     }
     mipdata_->terminatorReport();
     // Report on any active MIP race