Introduced HighsMipSolver::initialiseMipRace

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 = true;  // false;//
+  const bool ci_test = false;//true;  // 
   const std::string model = ci_test ? "flugpl" : "fiball";
   // "neos-3381206-awhea";
   const std::string model_file =

highs/mip/HighsMipSolver.cpp

@@ -44,7 +44,12 @@ HighsMipSolver::HighsMipSolver(HighsCallback& callback,
       implicinit(nullptr) {
   assert(!submip || submip_level > 0);
   max_submip_level = 0;
+  // Initialise empty terminator, since this sets termination_status_
+  // to HighsModelStatus::kNotset...
   initialiseTerminator();
+  // ... and empty MIP race
+  initialiseMipRace();
+  assert(termination_status_ == HighsModelStatus::kNotset);
   if (solution.value_valid) {
 #ifndef NDEBUG
     // MIP solver doesn't check row residuals, but they should be OK
@@ -994,15 +999,24 @@ bool HighsMipSolver::solutionFeasible(const HighsLp* lp,
   return feasible;
 }
 
+std::vector<HighsModelStatus> HighsMipSolver::initialiseTerminatorRecord(
+    HighsInt num_instance) const {
+  std::vector<HighsModelStatus> record(num_instance, HighsModelStatus::kNotset);
+  return record;
+}
+
 void HighsMipSolver::initialiseTerminator(HighsInt num_instance_,
                                           HighsInt my_instance_,
                                           HighsModelStatus* record_) {
   this->termination_status_ = HighsModelStatus::kNotset;
+  this->terminator_.clear();
   this->terminator_.initialise(num_instance_, my_instance_, record_);
 }
 
-std::vector<HighsModelStatus> HighsMipSolver::initialiseTerminatorRecord(
-    HighsInt num_instance) const {
-  std::vector<HighsModelStatus> record(num_instance, HighsModelStatus::kNotset);
-  return record;
+void HighsMipSolver::initialiseMipRace(const HighsInt mip_race_concurrency,
+				       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);
 }

highs/mip/HighsMipSolver.h

@@ -167,6 +167,10 @@ class HighsMipSolver {
                         double& bound_violation, double& row_violation,
                         double& integrality_violation, HighsCDouble& obj) const;
 
+  void initialiseMipRace(const HighsInt mip_race_concurrency = 0,
+                         const HighsInt my_instance_ = kNoThreadInstance,
+			 MipRaceRecord* record_ = nullptr);
+  
   std::vector<HighsModelStatus> initialiseTerminatorRecord(
       HighsInt num_instance) const;
   void initialiseTerminator(HighsInt num_instance_ = 0,

highs/mip/HighsMipSolverData.cpp

@@ -2937,8 +2937,11 @@ void MipRaceRecord::initialise(const HighsInt mip_race_concurrency,
   this->clear();
   MipRaceIncumbent incumbent_;
   incumbent_.initialise(num_col);
-  for (HighsInt instance = 0; instance < mip_race_concurrency; instance++)
+  // Loop from 1...
+  for (HighsInt instance = 1; instance < mip_race_concurrency; instance++)
     this->incumbent.push_back(incumbent_);
+  // ... and move incumbent_ to complete the vector of incumbents
+  this->incumbent.push_back(std::move(incumbent_));
 }
 
 HighsInt MipRaceRecord::concurrency() const {
@@ -2980,11 +2983,11 @@ void MipRace::initialise(const HighsInt mip_race_concurrency,
                          const HighsInt my_instance_, MipRaceRecord* record_,
                          const HighsLogOptions log_options_) {
   this->clear();
-  assert(mip_race_concurrency > 0);
   this->my_instance = my_instance_;
   this->record = record_;
   this->log_options = log_options_;
-  this->last_incumbent_read.assign(mip_race_concurrency, kMipRaceNoSolution);
+  if (mip_race_concurrency > 0)
+    this->last_incumbent_read.assign(mip_race_concurrency, kMipRaceNoSolution);
 }
 
 HighsInt MipRace::concurrency() const {
@@ -3034,6 +3037,7 @@ void HighsTerminator::clear() {
 
 void HighsTerminator::initialise(HighsInt num_instance_, HighsInt my_instance_,
                                  HighsModelStatus* record_) {
+  this->clear();
   this->num_instance = num_instance_;
   this->my_instance = my_instance_;
   this->record = record_;