Skip to content

Commit

Permalink
Suppressing initial_root_node_solve
Browse files Browse the repository at this point in the history
  • Loading branch information
jajhall committed Dec 2, 2024
1 parent 3c98069 commit 593ec7b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
3 changes: 2 additions & 1 deletion src/mip/HighsMipSolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 9 additions & 5 deletions src/mip/HighsMipSolverData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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);
Expand Down

0 comments on commit 593ec7b

Please sign in to comment.