From d2d24675702d2cdcdabf4d366d8df88c29574748 Mon Sep 17 00:00:00 2001 From: jajhall Date: Wed, 22 Jan 2025 14:41:29 +0000 Subject: [PATCH] Added % solve time to FJ line --- src/mip/MipTimer.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mip/MipTimer.h b/src/mip/MipTimer.h index 3c395c3af5..7093e0b8a7 100644 --- a/src/mip/MipTimer.h +++ b/src/mip/MipTimer.h @@ -346,10 +346,12 @@ class MipTimer { const HighsTimerClock& mip_timer_clock) { HighsTimer* timer_pointer = mip_timer_clock.timer_pointer_; HighsInt iClock = mip_timer_clock.clock_[kMipClockFeasibilityJump]; - printf("grepFK,%s,%s,%d,%g\n", model.c_str(), + const double fj_time = timer_pointer->read(iClock); + const double total_time = timer_pointer->read(); + const double pct = total_time > 0 ? 1e2 * fj_time / total_time : 0; + printf("grepFK,%s,%s,%d,%g,%g\n", model.c_str(), timer_pointer->clock_names[iClock].c_str(), - int(timer_pointer->clock_num_call[iClock]), - timer_pointer->read(iClock)); + int(timer_pointer->clock_num_call[iClock]), fj_time, pct); } };