Skip to content

Commit 8591ad4

Browse files
committed
Use && for logical and
1 parent bb09f23 commit 8591ad4

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/mip/HighsMipSolver.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void HighsMipSolver::run() {
129129
mipdata_->runPresolve(options_mip_->presolve_reduction_limit);
130130
analysis_.mipTimerStop(kMipClockRunPresolve);
131131
analysis_.mipTimerStop(kMipClockPresolve);
132-
if (analysis_.analyse_mip_time & !submip)
132+
if (analysis_.analyse_mip_time && !submip)
133133
highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
134134
"MIP-Timing: %11.2g - completed presolve\n", timer_.read());
135135
// Identify whether time limit has been reached (in presolve)
@@ -153,13 +153,13 @@ void HighsMipSolver::run() {
153153

154154
analysis_.mipTimerStart(kMipClockSolve);
155155

156-
if (analysis_.analyse_mip_time & !submip)
156+
if (analysis_.analyse_mip_time && !submip)
157157
highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
158158
"MIP-Timing: %11.2g - starting setup\n", timer_.read());
159159
analysis_.mipTimerStart(kMipClockRunSetup);
160160
mipdata_->runSetup();
161161
analysis_.mipTimerStop(kMipClockRunSetup);
162-
if (analysis_.analyse_mip_time & !submip)
162+
if (analysis_.analyse_mip_time && !submip)
163163
highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
164164
"MIP-Timing: %11.2g - completed setup\n", timer_.read());
165165
restart:
@@ -180,7 +180,7 @@ void HighsMipSolver::run() {
180180
return;
181181
}
182182
analysis_.mipTimerStop(kMipClockTrivialHeuristics);
183-
if (analysis_.analyse_mip_time & !submip)
183+
if (analysis_.analyse_mip_time && !submip)
184184
highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
185185
"MIP-Timing: %11.2g - starting evaluate root node\n",
186186
timer_.read());
@@ -192,7 +192,7 @@ void HighsMipSolver::run() {
192192
if (analysis_.analyse_mip_time &&
193193
analysis_.mipTimerRunning(kMipClockIpmSolveLp))
194194
analysis_.mipTimerStop(kMipClockIpmSolveLp);
195-
if (analysis_.analyse_mip_time & !submip)
195+
if (analysis_.analyse_mip_time && !submip)
196196
highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
197197
"MIP-Timing: %11.2g - completed evaluate root node\n",
198198
timer_.read());

0 commit comments

Comments
 (0)