Skip to content

Commit 50efb41

Browse files
committed
Omitted time from symmetry announcement when timelss_log is true
1 parent 51ac785 commit 50efb41

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

src/lp_data/HighsOptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ class HighsOptions : public HighsOptionsStruct {
851851

852852
record_bool = new OptionRecordBool(
853853
"timeless_log", "Suppression of time-based data in logging", true,
854-
&timeless_log, false); // true); //
854+
&timeless_log, true);
855855
records.push_back(record_bool);
856856

857857
record_string =

src/mip/HighsMipSolverData.cpp

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -372,10 +372,8 @@ void HighsMipSolverData::finishAnalyticCenterComputation(
372372
}
373373
if (nfixed > 0)
374374
highsLogDev(mipsolver.options_mip_->log_options, HighsLogType::kInfo,
375-
"Fixing %" HIGHSINT_FORMAT " columns (%" HIGHSINT_FORMAT
376-
" integers) sitting at bound at "
377-
"analytic center\n",
378-
nfixed, nintfixed);
375+
"Fixing %d columns (%d integers) sitting at bound at analytic center\n",
376+
int(nfixed), int(nintfixed));
379377
mipsolver.mipdata_->domain.propagate();
380378
if (mipsolver.mipdata_->domain.infeasible()) return;
381379
}
@@ -406,34 +404,34 @@ void HighsMipSolverData::finishSymmetryDetection(
406404
taskGroup.sync();
407405

408406
symmetries = std::move(symData->symmetries);
407+
std::string symmetry_time = mipsolver.options_mip_->timeless_log ? "" :
408+
highsFormatToString(" %.1fs", symData->detectionTime);
409409
highsLogUser(mipsolver.options_mip_->log_options, HighsLogType::kInfo,
410-
"\nSymmetry detection completed in %.1fs\n",
411-
symData->detectionTime);
410+
"\nSymmetry detection completed in%s\n",
411+
symmetry_time.c_str());
412412

413413
if (symmetries.numGenerators == 0) {
414414
detectSymmetries = false;
415415
highsLogUser(mipsolver.options_mip_->log_options, HighsLogType::kInfo,
416416
"No symmetry present\n\n");
417417
} else if (symmetries.orbitopes.size() == 0) {
418418
highsLogUser(mipsolver.options_mip_->log_options, HighsLogType::kInfo,
419-
"Found %" HIGHSINT_FORMAT " generator(s)\n\n",
420-
symmetries.numGenerators);
419+
"Found %d generator(s)\n\n",
420+
int(symmetries.numGenerators));
421421

422422
} else {
423423
if (symmetries.numPerms != 0) {
424424
highsLogUser(
425425
mipsolver.options_mip_->log_options, HighsLogType::kInfo,
426-
"Found %" HIGHSINT_FORMAT " generator(s) and %" HIGHSINT_FORMAT
427-
" full orbitope(s) acting on %" HIGHSINT_FORMAT " columns\n\n",
428-
symmetries.numPerms, (HighsInt)symmetries.orbitopes.size(),
429-
(HighsInt)symmetries.columnToOrbitope.size());
426+
"Found %d generator(s) and %d full orbitope(s) acting on %d columns\n\n",
427+
int(symmetries.numPerms),
428+
int(symmetries.orbitopes.size()),
429+
int(symmetries.columnToOrbitope.size()));
430430
} else {
431431
highsLogUser(mipsolver.options_mip_->log_options, HighsLogType::kInfo,
432-
"Found %" HIGHSINT_FORMAT
433-
" full orbitope(s) acting on %" HIGHSINT_FORMAT
434-
" columns\n\n",
435-
(HighsInt)symmetries.orbitopes.size(),
436-
(HighsInt)symmetries.columnToOrbitope.size());
432+
"Found %d full orbitope(s) acting on %d columns\n\n",
433+
int(symmetries.orbitopes.size()),
434+
int(symmetries.columnToOrbitope.size()));
437435
}
438436
}
439437
symData.reset();

0 commit comments

Comments
 (0)