Use HighsTerminator::my_instance

Author: jajhall

highs/mip/HighsMipSolver.cpp

@@ -690,23 +690,25 @@ void HighsMipSolver::run() {
 
 void HighsMipSolver::cleanupSolve() {
   if (!submip) {
-    if (terminator_.notTerminated()) {
-      // No other instance has terminated the MIP race, so terminate
-      // it
-      highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
-                   "instance%d: terminate   %6.4f (MIP)\n",
-                   int(this->mipdata_->mipRaceMyInstance()),
-                   this->timer_.read());
-      terminator_.terminate();
-    } else {
-      // Indicate that this MIP race instance has been interrupted
-      highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
-                   "instance%d: terminated  %6.4f (MIP)\n",
-                   int(this->mipdata_->mipRaceMyInstance()),
-                   this->timer_.read());
-      modelstatus_ = HighsModelStatus::kHighsInterrupt;
+    if (mipdata_->terminatorActive()) {
+      if (!mipdata_->terminatorTerminated()) {
+	// No other instance has terminated the MIP race, so terminate
+	// it
+	highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
+		     "instance%d: terminate   %6.4f (MIP)\n",
+		     int(this->mipdata_->mipRaceMyInstance()),
+		     this->timer_.read());
+	mipdata_->terminatorTerminate();
+      } else {
+	// Indicate that this instance has been interrupted
+	highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
+		     "instance%d: terminated  %6.4f (MIP)\n",
+		     int(this->mipdata_->mipRaceMyInstance()),
+		     this->timer_.read());
+	modelstatus_ = HighsModelStatus::kHighsInterrupt;
+      }
+      if (mipdata_->mipRaceActive()) mipdata_->mipRaceReport();
     }
-    mipdata_->mipRaceReport();
   }
 
   // Force a final logging line

highs/mip/HighsMipSolver.h

@@ -67,8 +67,8 @@ struct HighsTerminator {
   void initialise(HighsInt num_instance_, HighsInt my_instance_,
                   HighsModelStatus* record_);
   void terminate();
-  HighsModelStatus terminated() const;
-  bool notTerminated() const;
+  bool terminated() const;
+  HighsModelStatus terminationStatus() const;
   void report(const HighsLogOptions log_options) const;
 };
 

highs/mip/HighsMipSolverData.cpp

@@ -2422,14 +2422,11 @@ bool HighsMipSolverData::checkLimits(int64_t nodeOffset) const {
   if (!mipsolver.submip) {
     highsLogUser(options.log_options, HighsLogType::kInfo,
 		 "instance%d: terminated? %6.4f (MIP)\n", int(this->mipRaceMyInstance()), this->mipsolver.timer_.read());
-    assert(this->terminated() == this->terminated());
-    if (this->terminated()) {
+    if (this->terminatorTerminated()) {
       highsLogUser(options.log_options, HighsLogType::kInfo,
 		 "instance%d: terminated  %6.4f (MIP)\n", int(this->mipRaceMyInstance()), this->mipsolver.timer_.read());
       return true;
     }
-    assert(this->terminated() == this->terminated());
-    if (this->terminated()) return true;
   }
 
   // Possible user interrupt
@@ -2734,14 +2731,14 @@ void HighsMipSolverData::mipRaceReport() const {
   if (mipsolver.mip_race_.record) mipsolver.mip_race_.report();  
 }
 
-void HighsMipSolverData::terminate() {
-  if (mipsolver.terminator_.num_instance <= 0) return;
+void HighsMipSolverData::terminatorTerminate() {
+  assert(mipsolver.terminator_.num_instance > 0);
   mipsolver.terminator_.terminate();
 }
 
-bool HighsMipSolverData::terminated() const {
-  if (mipsolver.terminator_.num_instance > 0) 
-    mipsolver.termination_status_ = mipsolver.terminator_.terminated();
+bool HighsMipSolverData::terminatorTerminated() const {
+  if (this->terminatorActive()) 
+    mipsolver.termination_status_ = mipsolver.terminator_.terminationStatus();
   return mipsolver.termination_status_ != HighsModelStatus::kNotset;
 }
 
@@ -3039,7 +3036,7 @@ void HighsTerminator::terminate() {
   this->record[this->my_instance] = HighsModelStatus::kHighsInterrupt;
 }
 
-HighsModelStatus HighsTerminator::terminated() const {
+HighsModelStatus HighsTerminator::terminationStatus() const {
   assert(this->record);
   for (HighsInt instance = 0; instance < this->num_instance; instance++) {
     if (this->record[instance] != HighsModelStatus::kNotset)
@@ -3048,15 +3045,6 @@ HighsModelStatus HighsTerminator::terminated() const {
   return HighsModelStatus::kNotset;
 }
 
-bool HighsTerminator::notTerminated() const {
-  assert(this->record);
-  for (HighsInt instance = 0; instance < this->num_instance; instance++) {
-    if (this->record[instance] != HighsModelStatus::kNotset)
-      return false;
-  }
-  return true;
-}
-
 void HighsTerminator::report(const HighsLogOptions log_options) const {
   highsLogUser(log_options, HighsLogType::kInfo, "\nTerminator:        ");
   for (HighsInt instance = 0; instance < this->num_instance; instance++) 

highs/mip/HighsMipSolverData.h

@@ -302,14 +302,16 @@ struct HighsMipSolverData {
       const ExternalMipSolutionQueryOrigin external_solution_query_origin);
 
   HighsInt mipRaceConcurrency() const;
+  bool mipRaceActive() const { return mipRaceConcurrency() > 0; }
   HighsInt mipRaceMyInstance() const;
   void mipRaceUpdate();
   HighsInt mipRaceNewSolution(const HighsInt instance, double& objective_value,
                               std::vector<double>& solution);
   void mipRaceReport() const;
 
-  void terminate();
-  bool terminated() const;
+  void terminatorTerminate();
+  bool terminatorTerminated() const;
+  bool terminatorActive() const { return mipsolver.terminator_.num_instance > 0; }
 };
 
 #endif