Cleared out development logging

Author: jajhall

check/TestMipSolver.cpp

@@ -1037,8 +1037,9 @@ TEST_CASE("issue-2432", "[highs_test_mip_solver]") {
 }
 
 TEST_CASE("mip-race", "[highs_test_mip_solver]") {
-  const bool ci_test = true;
-  const std::string model = ci_test ? "flugpl" : "fiball";
+  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";
   const std::string model_file =
       ci_test ? std::string(HIGHS_DIR) + "/check/instances/" + model + ".mps"

highs/lp_data/Highs.cpp

@@ -4049,7 +4049,7 @@ HighsStatus Highs::callSolveMip() {
     worker_callback.clear();
     // Race the MIP solver!
     highsLogUser(options_.log_options, HighsLogType::kInfo,
-                 "Starting MIP race with %d instances: performance is "
+                 "Starting MIP race with %d instances: behaviour is "
                  "non-deterministic!\n",
                  int(mip_race_concurrency));
     // Define the HighsMipSolverInfo record for each worker
@@ -4083,10 +4083,7 @@ HighsStatus Highs::callSolveMip() {
                                           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);
-              mip_time[instance] = -this_time;
+              mip_time[instance] = -timer_.read();
               solver.run();
               mip_time[instance] += timer_.read();
               mip_solver_info = getMipSolverInfo(solver);
@@ -4097,11 +4094,7 @@ HighsStatus Highs::callSolveMip() {
                                           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),
-                           this_time);
-              mip_time[instance] = -this_time;
+              mip_time[instance] = -timer_.read();
               worker.run();
               mip_time[instance] += timer_.read();
               worker_info[instance] = getMipSolverInfo(worker);

highs/lp_data/HighsInterface.cpp

@@ -4269,7 +4269,7 @@ HighsStatus Highs::mipRaceResults(
   HighsInt winning_instance = -1;
   HighsModelStatus winning_model_status = HighsModelStatus::kNotset;
   highsLogUser(options_.log_options, HighsLogType::kInfo,
-               "/nMIP race results\n");
+               "\nMIP race results\n");
   for (HighsInt instance = 0; instance < mip_race_concurrency; instance++) {
     const HighsMipSolverInfo& solver_info =
         instance == 0 ? mip_solver_info : worker_info[instance];

highs/mip/HighsMipSolver.cpp

@@ -75,11 +75,6 @@ HighsMipSolver::~HighsMipSolver() = default;
 void HighsMipSolver::run() {
   modelstatus_ = HighsModelStatus::kNotset;
 
-  if (!submip)
-    highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
-                 "instance%d: top   run() %6.4f (MIP)\n",
-                 int(this->mip_race_.my_instance), this->timer_.read());
-
   if (submip) {
     analysis_.analyse_mip_time = false;
   } else {
@@ -699,13 +694,8 @@ void HighsMipSolver::run() {
 
 void HighsMipSolver::cleanupSolve() {
   if (mipdata_->terminatorActive()) {
-    mipdata_->terminatorReport();
     if (mipdata_->terminatorTerminated()) {
       // Indicate that this instance has been interrupted
-      highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
-                   "instance%d: terminated  %6.4f (%sMIP)\n",
-                   int(this->mipdata_->terminatorMyInstance()),
-                   this->timer_.read(), submip ? "sub-" : "");
       modelstatus_ = HighsModelStatus::kHighsInterrupt;
     } else if (!submip) {
       // When sub-MIPs call cleanupSolve(), they generally don't have
@@ -715,15 +705,8 @@ void HighsMipSolver::cleanupSolve() {
       // reached
       //
       // No other instance has terminated, so terminate
-      highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
-                   "instance%d: terminate   %6.4f (%sMIP)\n",
-                   int(this->mipdata_->terminatorMyInstance()),
-                   this->timer_.read(), submip ? "sub-" : "");
       mipdata_->terminatorTerminate();
     }
-    mipdata_->terminatorReport();
-    // Report on any active MIP race
-    mipdata_->mipRaceReport();
   }
 
   // Force a final logging line

highs/mip/HighsMipSolverData.cpp

@@ -2421,20 +2421,8 @@ bool HighsMipSolverData::checkLimits(int64_t nodeOffset) const {
   const HighsOptions& options = *mipsolver.options_mip_;
 
   // This MIP instance may have been terminated
-  if (terminatorActive()) {
-    highsLogUser(options.log_options, HighsLogType::kInfo,
-                 "instance%d: terminated? %6.4f (%sMIP)\n",
-                 int(this->terminatorMyInstance()),
-                 this->mipsolver.timer_.read(), mipsolver.submip ? "sub-" : "");
-    if (this->terminatorTerminated()) {
-      highsLogUser(options.log_options, HighsLogType::kInfo,
-                   "instance%d: terminated  %6.4f (%sMIP)\n",
-                   int(this->terminatorMyInstance()),
-                   this->mipsolver.timer_.read(),
-                   mipsolver.submip ? "sub-" : "");
-      return true;
-    }
-  }
+  if (terminatorActive()) 
+    if (this->terminatorTerminated()) return true;
 
   // Possible user interrupt
   if (!mipsolver.submip && mipsolver.callback_->user_callback) {
@@ -2999,7 +2987,7 @@ void MipRace::update(const double objective,
                      const std::vector<double>& solution) {
   assert(this->record);
   this->record->update(this->my_instance, objective, solution);
-  this->report();
+  //  this->report();
 }
 
 bool MipRace::newSolution(const HighsInt instance, double objective,

highs/mip/HighsPrimalHeuristics.cpp

@@ -145,11 +145,6 @@ bool HighsPrimalHeuristics::solveSubMip(
   // Initialise termination_status_ and propagate any terminator to
   // the sub-MIP
   submipsolver.initialiseTerminator(mipsolver);
-  printf(
-      "HighsPrimalHeuristics::solveSubMip: %d submipsolver.termination_status_ "
-      "= %d\n",
-      int(submipsolver.terminator_.my_instance),
-      int(submipsolver.termination_status_));
   submipsolver.rootbasis = &basis;
   HighsPseudocostInitialization pscostinit(mipsolver.mipdata_->pseudocost, 1);
   submipsolver.pscostinit = &pscostinit;
@@ -172,9 +167,6 @@ bool HighsPrimalHeuristics::solveSubMip(
     assert(submipsolver.mipdata_);
   }
   if (submipsolver.termination_status_ != HighsModelStatus::kNotset) {
-    printf("HighsPrimalHeuristics::solveSubMip: %d termination status is %d\n",
-           int(submipsolver.terminator_.my_instance),
-           int(submipsolver.termination_status_));
     mipsolver.termination_status_ = submipsolver.termination_status_;
     return false;
   }