Now propagating terminator to sub-MIPs, but still have to test for it!

Author: jajhall

highs/mip/HighsMipSolver.cpp

@@ -1013,6 +1013,15 @@ void HighsMipSolver::initialiseTerminator(HighsInt num_instance_,
   this->terminator_.initialise(num_instance_, my_instance_, record_);
 }
 
+void HighsMipSolver::initialiseTerminator(const HighsMipSolver& mip_solver) {
+  this->terminator_.clear();
+  if (!mip_solver.mipdata_->terminatorActive()) return;
+  assert(mip_solver.mipdata_->terminatorConcurrency() > 0);
+  this->initialiseTerminator(mip_solver.mipdata_->terminatorConcurrency(),
+			     mip_solver.mipdata_->terminatorMyInstance(),
+			     mip_solver.terminator_.record);  
+}
+
 void HighsMipSolver::initialiseMipRace(const HighsInt mip_race_concurrency,
                                        const HighsInt my_instance,
                                        MipRaceRecord* record) {

highs/mip/HighsMipSolver.h

@@ -176,6 +176,7 @@ class HighsMipSolver {
   void initialiseTerminator(HighsInt num_instance_ = 0,
                             HighsInt my_instance_ = kNoThreadInstance,
                             HighsModelStatus* record_ = nullptr);
+  void initialiseTerminator(const HighsMipSolver& mip_solver);
   bool terminate() const {
     return this->termination_status_ != HighsModelStatus::kNotset;
   }

highs/mip/HighsPrimalHeuristics.cpp

@@ -142,6 +142,9 @@ bool HighsPrimalHeuristics::solveSubMip(
     mipsolver.analysis_.mipTimerStart(kMipClockSubMipSolve);
   HighsMipSolver submipsolver(*mipsolver.callback_, submipoptions, submip,
                               solution, true, mipsolver.submip_level + 1);
+  // Initialise termination_status_ and propagate any terminator to
+  // the sub-MIP
+  submipsolver.initialiseTerminator(mipsolver);
   submipsolver.rootbasis = &basis;
   HighsPseudocostInitialization pscostinit(mipsolver.mipdata_->pseudocost, 1);
   submipsolver.pscostinit = &pscostinit;
@@ -152,6 +155,21 @@ bool HighsPrimalHeuristics::solveSubMip(
   mipsolver.max_submip_level =
       std::max(submipsolver.max_submip_level + 1, mipsolver.max_submip_level);
   if (!mipsolver.submip) mipsolver.analysis_.mipTimerStop(kMipClockSubMipSolve);
+  // 22/07/25: Seems impossible for submipsolver.mipdata_ to be a null
+  // pointer after calling HighsMipSolver::run(), and assert isn't
+  // triggered for anything in ctest, but use direct test of
+  // submipsolver.termination_status_, rather than
+  // submipsolver.mipdata_.terminatorTerminated()
+  if (!submipsolver.mipdata_) {
+    printf("HighsPrimalHeuristics::solveSubMip: submipsolver.mipdata_ is nullptr\n");
+    assert(submipsolver.mipdata_);
+  }
+  if (submipsolver.termination_status_ != HighsModelStatus::kNotset) {
+    printf("HighsPrimalHeuristics::solveSubMip: termination status is %d\n", int(submipsolver.termination_status_));
+    mipsolver.termination_status_ = submipsolver.termination_status_;
+    assert(111==333);
+    return;
+  }
   if (submipsolver.mipdata_) {
     double numUnfixed = mipsolver.mipdata_->integral_cols.size() +
                         mipsolver.mipdata_->continuous_cols.size();