From 8591ad42ad51759d6ce647c75f16c05b29518f8c Mon Sep 17 00:00:00 2001 From: fwesselm Date: Wed, 29 Jan 2025 13:09:47 +0100 Subject: [PATCH] Use && for logical and --- src/mip/HighsMipSolver.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mip/HighsMipSolver.cpp b/src/mip/HighsMipSolver.cpp index f432173423..7e54b36c44 100644 --- a/src/mip/HighsMipSolver.cpp +++ b/src/mip/HighsMipSolver.cpp @@ -129,7 +129,7 @@ void HighsMipSolver::run() { mipdata_->runPresolve(options_mip_->presolve_reduction_limit); analysis_.mipTimerStop(kMipClockRunPresolve); analysis_.mipTimerStop(kMipClockPresolve); - if (analysis_.analyse_mip_time & !submip) + if (analysis_.analyse_mip_time && !submip) highsLogUser(options_mip_->log_options, HighsLogType::kInfo, "MIP-Timing: %11.2g - completed presolve\n", timer_.read()); // Identify whether time limit has been reached (in presolve) @@ -153,13 +153,13 @@ void HighsMipSolver::run() { analysis_.mipTimerStart(kMipClockSolve); - if (analysis_.analyse_mip_time & !submip) + if (analysis_.analyse_mip_time && !submip) highsLogUser(options_mip_->log_options, HighsLogType::kInfo, "MIP-Timing: %11.2g - starting setup\n", timer_.read()); analysis_.mipTimerStart(kMipClockRunSetup); mipdata_->runSetup(); analysis_.mipTimerStop(kMipClockRunSetup); - if (analysis_.analyse_mip_time & !submip) + if (analysis_.analyse_mip_time && !submip) highsLogUser(options_mip_->log_options, HighsLogType::kInfo, "MIP-Timing: %11.2g - completed setup\n", timer_.read()); restart: @@ -180,7 +180,7 @@ void HighsMipSolver::run() { return; } analysis_.mipTimerStop(kMipClockTrivialHeuristics); - if (analysis_.analyse_mip_time & !submip) + if (analysis_.analyse_mip_time && !submip) highsLogUser(options_mip_->log_options, HighsLogType::kInfo, "MIP-Timing: %11.2g - starting evaluate root node\n", timer_.read()); @@ -192,7 +192,7 @@ void HighsMipSolver::run() { if (analysis_.analyse_mip_time && analysis_.mipTimerRunning(kMipClockIpmSolveLp)) analysis_.mipTimerStop(kMipClockIpmSolveLp); - if (analysis_.analyse_mip_time & !submip) + if (analysis_.analyse_mip_time && !submip) highsLogUser(options_mip_->log_options, HighsLogType::kInfo, "MIP-Timing: %11.2g - completed evaluate root node\n", timer_.read());