Skip to content

Commit 2758461

Browse files
committed
adjusting logs
1 parent 363b71e commit 2758461

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

cpp/src/dual_simplex/basis_solves.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ i_t factorize_basis(const csc_matrix_t<i_t, f_t>& A,
362362
SU,
363363
S_perm_inv);
364364
if (settings.concurrent_halt != nullptr && *settings.concurrent_halt == 1) {
365-
settings.log.printf("Concurrent halt\n");
365+
if (!settings.inside_mip) { settings.log.printf("Concurrent halt\n"); }
366366
return -1;
367367
}
368368
if (Srank != Sdim) {
@@ -581,7 +581,7 @@ i_t factorize_basis(const csc_matrix_t<i_t, f_t>& A,
581581
}
582582
}
583583
if (settings.concurrent_halt != nullptr && *settings.concurrent_halt == 1) {
584-
settings.log.printf("Concurrent halt\n");
584+
if (!settings.inside_mip) { settings.log.printf("Concurrent halt\n"); }
585585
return -1;
586586
}
587587
if (verbose) {

cpp/src/dual_simplex/crossover.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ i_t dual_push(const lp_problem_t<i_t, f_t>& lp,
534534
return -1;
535535
}
536536
if (settings.concurrent_halt != nullptr && *settings.concurrent_halt == 1) {
537-
settings.log.printf("Concurrent halt\n");
537+
if (!settings.inside_mip) { settings.log.printf("Concurrent halt\n"); }
538538
return -2;
539539
}
540540
}
@@ -832,7 +832,7 @@ i_t primal_push(const lp_problem_t<i_t, f_t>& lp,
832832
return -1;
833833
}
834834
if (settings.concurrent_halt != nullptr && *settings.concurrent_halt == 1) {
835-
settings.log.printf("Concurrent halt\n");
835+
if (!settings.inside_mip) { settings.log.printf("Concurrent halt\n"); }
836836
return -2;
837837
}
838838
}
@@ -1163,7 +1163,7 @@ crossover_status_t crossover(const lp_problem_t<i_t, f_t>& lp,
11631163
return crossover_status_t::TIME_LIMIT;
11641164
}
11651165
if (settings.concurrent_halt != nullptr && *settings.concurrent_halt == 1) {
1166-
settings.log.printf("Concurrent halt\n");
1166+
if (!settings.inside_mip) { settings.log.printf("Concurrent halt\n"); }
11671167
return crossover_status_t::CONCURRENT_LIMIT;
11681168
}
11691169

@@ -1250,7 +1250,7 @@ crossover_status_t crossover(const lp_problem_t<i_t, f_t>& lp,
12501250
return crossover_status_t::TIME_LIMIT;
12511251
}
12521252
if (settings.concurrent_halt != nullptr && *settings.concurrent_halt == 1) {
1253-
settings.log.printf("Concurrent halt\n");
1253+
if (!settings.inside_mip) { settings.log.printf("Concurrent halt\n"); }
12541254
return crossover_status_t::CONCURRENT_LIMIT;
12551255
}
12561256
primal_infeas = primal_infeasibility(lp, settings, vstatus, solution.x);
@@ -1386,7 +1386,7 @@ crossover_status_t crossover(const lp_problem_t<i_t, f_t>& lp,
13861386
return crossover_status_t::TIME_LIMIT;
13871387
}
13881388
if (settings.concurrent_halt != nullptr && *settings.concurrent_halt == 1) {
1389-
settings.log.printf("Concurrent halt\n");
1389+
if (!settings.inside_mip) { settings.log.printf("Concurrent halt\n"); }
13901390
return crossover_status_t::CONCURRENT_LIMIT;
13911391
}
13921392
solution.iterations += iter;

cpp/src/dual_simplex/right_looking_lu.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* clang-format off */
22
/*
3-
* SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
* SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66
/* clang-format on */
@@ -1114,7 +1114,7 @@ i_t right_looking_lu_row_permutation_only(const csc_matrix_t<i_t, f_t>& A,
11141114
}
11151115

11161116
if (settings.concurrent_halt != nullptr && *settings.concurrent_halt == 1) {
1117-
settings.log.printf("Concurrent halt\n");
1117+
if (!settings.inside_mip) { settings.log.printf("Concurrent halt\n"); }
11181118
return -2;
11191119
}
11201120
}

0 commit comments

Comments
 (0)