Now reporting whole loop time for race

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

highs/Highs.h

@@ -1716,7 +1716,8 @@ class Highs {
   void getHighsFiles();
   HighsStatus mipRaceResults(HighsMipSolverInfo& mip_solver_info,
                              const std::vector<HighsMipSolverInfo>& worker_info,
-                             const std::vector<double>& mip_time);
+                             const std::vector<double>& mip_time,
+			     const double& report_mip_time);
 };
 
 // Start of deprecated methods not in the Highs class

highs/lp_data/Highs.cpp

@@ -4075,6 +4075,9 @@ HighsStatus Highs::callSolveMip() {
       lp, solution_); worker.push_back(&worker_instance);
       */
     }
+    // Time the master outside the parallel loop so that this "real"
+    // time is reported
+    double loop_mip_time = -timer_.read();
     highs::parallel::for_each(
         0, mip_race_concurrency, [&](HighsInt start, HighsInt end) {
           for (HighsInt instance = start; instance < end; instance++) {
@@ -4101,9 +4104,11 @@ HighsStatus Highs::callSolveMip() {
             }
           }
         });
+    loop_mip_time += timer_.read();
     // Determine the winner and report on the solution
     HighsStatus call_status =
-        this->mipRaceResults(mip_solver_info, worker_info, mip_time);
+      this->mipRaceResults(mip_solver_info, worker_info, mip_time,
+			   loop_mip_time);
     if (call_status == HighsStatus::kError) {
       const bool undo_mods = true;
       return returnFromOptimizeModel(HighsStatus::kError, undo_mods);

highs/lp_data/HighsInterface.cpp

@@ -4264,7 +4264,8 @@ void HighsMipSolverInfo::clear() {
 HighsStatus Highs::mipRaceResults(
     HighsMipSolverInfo& mip_solver_info,
     const std::vector<HighsMipSolverInfo>& worker_info,
-    const std::vector<double>& mip_time) {
+    const std::vector<double>& mip_time,
+    const double& report_mip_time) {
   const HighsInt mip_race_concurrency = this->options_.mip_race_concurrency;
   HighsInt winning_instance = -1;
   HighsModelStatus winning_model_status = HighsModelStatus::kNotset;
@@ -4275,7 +4276,7 @@ HighsStatus Highs::mipRaceResults(
         instance == 0 ? mip_solver_info : worker_info[instance];
     HighsModelStatus instance_model_status = solver_info.modelstatus;
     highsLogUser(options_.log_options, HighsLogType::kInfo,
-                 "   Solver %d has best objective %15.8g, gap %6.2f\% (time "
+                 "   Solver %2d has best objective %15.8g, gap %6.2f\% (time "
                  "= %6.2f), and status %s\n",
                  int(instance), solver_info.solution_objective,
                  1e2 * solver_info.gap, mip_time[instance],
@@ -4348,8 +4349,10 @@ HighsStatus Highs::mipRaceResults(
   highsLogUser(options_.log_options, HighsLogType::kInfo,
                "                    %.12g (row viol.)\n",
                mip_solver_info.row_violation);
+  // Report the solution time for the whole concurrent loop, as that's
+  // "real" time
   highsLogUser(options_.log_options, HighsLogType::kInfo,
-               "  Timing            %.2f\n", mip_time[winning_instance]);
+               "  Timing            %.2f\n", report_mip_time);
   highsLogUser(options_.log_options, HighsLogType::kInfo,
                "  Max sub-MIP depth %d\n",
                int(mip_solver_info.max_submip_level));