Ready to externd terminator to sub-MIPs!

Author: jajhall

check/TestMipSolver.cpp

@@ -1037,7 +1037,7 @@ TEST_CASE("issue-2432", "[highs_test_mip_solver]") {
 }
 
 TEST_CASE("mip-race", "[highs_test_mip_solver]") {
-  const bool ci_test = false;//true;  // 
+  const bool ci_test = true;  // false;//
   const std::string model = ci_test ? "flugpl" : "fiball";
   // "neos-3381206-awhea";
   const std::string model_file =

highs/lp_data/Highs.cpp

@@ -4079,11 +4079,10 @@ HighsStatus Highs::callSolveMip() {
         0, mip_race_concurrency, [&](HighsInt start, HighsInt end) {
           for (HighsInt instance = start; instance < end; instance++) {
             if (instance == 0) {
-              solver.mip_race_.initialise(mip_race_concurrency, instance,
-                                          &mip_race_record,
-                                          options_.log_options);
               solver.initialiseTerminator(mip_race_concurrency, instance,
                                           terminator_record.data());
+              solver.initialiseMipRace(mip_race_concurrency, instance,
+                                       &mip_race_record);
               double this_time = timer_.read();
               highsLogUser(options_.log_options, HighsLogType::kInfo,
                            "instance0: call  run() %f6.4\n", this_time);
@@ -4094,11 +4093,10 @@ HighsStatus Highs::callSolveMip() {
             } else {
               HighsMipSolver worker(worker_callback, worker_options[instance],
                                     lp, solution_);
-              worker.mip_race_.initialise(mip_race_concurrency, instance,
-                                          &mip_race_record,
-                                          worker_options[instance].log_options);
               worker.initialiseTerminator(mip_race_concurrency, instance,
                                           terminator_record.data());
+              worker.initialiseMipRace(mip_race_concurrency, instance,
+                                       &mip_race_record);
               double this_time = timer_.read();
               highsLogUser(options_.log_options, HighsLogType::kInfo,
                            "instance%d: call  run() %f6.4\n", int(instance),

highs/mip/HighsMipSolver.cpp

@@ -1014,9 +1014,9 @@ void HighsMipSolver::initialiseTerminator(HighsInt num_instance_,
 }
 
 void HighsMipSolver::initialiseMipRace(const HighsInt mip_race_concurrency,
-				       const HighsInt my_instance,
-				       MipRaceRecord* record) {
+                                       const HighsInt my_instance,
+                                       MipRaceRecord* record) {
   this->mip_race_.clear();
   this->mip_race_.initialise(mip_race_concurrency, my_instance, record,
-			     this->options_mip_->log_options);
+                             this->options_mip_->log_options);
 }

highs/mip/HighsMipSolver.h

@@ -169,8 +169,8 @@ class HighsMipSolver {
 
   void initialiseMipRace(const HighsInt mip_race_concurrency = 0,
                          const HighsInt my_instance_ = kNoThreadInstance,
-			 MipRaceRecord* record_ = nullptr);
-  
+                         MipRaceRecord* record_ = nullptr);
+
   std::vector<HighsModelStatus> initialiseTerminatorRecord(
       HighsInt num_instance) const;
   void initialiseTerminator(HighsInt num_instance_ = 0,