From 593ec7b4f785c5ff8b3ed633d17bc00cc61b3da0 Mon Sep 17 00:00:00 2001 From: JAJHall Date: Mon, 2 Dec 2024 23:42:51 +0000 Subject: [PATCH] Suppressing initial_root_node_solve --- src/mip/HighsMipSolver.cpp | 3 ++- src/mip/HighsMipSolverData.cpp | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/mip/HighsMipSolver.cpp b/src/mip/HighsMipSolver.cpp index 61555b5a72..cf5ab3f7a2 100644 --- a/src/mip/HighsMipSolver.cpp +++ b/src/mip/HighsMipSolver.cpp @@ -168,7 +168,8 @@ void HighsMipSolver::run() { highsLogUser(options_mip_->log_options, HighsLogType::kInfo, "MIP-Timing: %11.2g - completed setup\n", timer_.read(timer_.total_clock)); - if (!submip) { + const bool initial_root_node_solve = false; + if (!submip && initial_root_node_solve) { if (analysis_.analyse_mip_time) { highsLogUser(options_mip_->log_options, HighsLogType::kInfo, "MIP-Timing: %11.2g - starting relaxation simplex solve\n", diff --git a/src/mip/HighsMipSolverData.cpp b/src/mip/HighsMipSolverData.cpp index f3d940688f..e3fee8fe8a 100644 --- a/src/mip/HighsMipSolverData.cpp +++ b/src/mip/HighsMipSolverData.cpp @@ -302,7 +302,7 @@ void HighsMipSolverData::startAnalyticCenterComputation( taskGroup.spawn([&]() { // first check if the analytic centre computation should be cancelled, e.g. // due to early return in the root node evaluation - const bool ac_logging = !mipsolver.submip; // 2049 unset this + const bool ac_logging = false; //! mipsolver.submip; // 2049 unset this Highs ipm; if (mipsolver.options_mip_->mip_old_analytic_centre_method) { // Original calculation is just IPM with crossover off @@ -315,15 +315,16 @@ void HighsMipSolverData::startAnalyticCenterComputation( } ipm.setOptionValue("presolve", "off"); ipm.setOptionValue("output_flag", false); - ipm.setOptionValue("output_flag", - !mipsolver.submip); // 2049 unset this ultimately + // ipm.setOptionValue("output_flag", !mipsolver.submip); // 2049 unset + // this ultimately ipm.setOptionValue("ipm_iteration_limit", 200); double time_available = std::max(mipsolver.options_mip_->time_limit - mipsolver.timer_.read(mipsolver.timer_.total_clock), 0.1); ipm.setOptionValue("time_limit", time_available); - ipm.setOptionValue("kkt_logging", !mipsolver.submip); // 2049 unset this + // ipm.setOptionValue("kkt_logging", !mipsolver.submip); // 2049 unset + // this // ultimately // // cr1_iteration_limit is what's set internal to IPX to limit the @@ -344,7 +345,10 @@ void HighsMipSolverData::startAnalyticCenterComputation( // 2049 Set this ultimately // ipm.setOptionValue("cr2_iteration_limit", cr2_iteration_limit); - if (!mipsolver.submip) this->simplex_stats.report(stdout); + // if (!mipsolver.submip) this->simplex_stats.report(stdout);2049 unset + // this + // ultimately + // ipm.passSimplexStats(this->simplex_stats); HighsLp lpmodel(*mipsolver.model_); lpmodel.col_cost_.assign(lpmodel.num_col_, 0.0);