From e51c53084cf127522fcc0b5d8e4f64ab84e17382 Mon Sep 17 00:00:00 2001 From: Alexander Chernov Date: Sun, 17 Nov 2024 19:51:22 +0300 Subject: [PATCH] fix wrong placement of group_score accounting --- lib/runlog.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/runlog.c b/lib/runlog.c index f48b36065..bb0825d17 100644 --- a/lib/runlog.c +++ b/lib/runlog.c @@ -954,10 +954,6 @@ run_get_attempts( ASSERT(re->user_id == sample_re->user_id); if (i >= runid) break; - if (group_merge_flag > 0 && re->group_scores) { - group_scores_merge_1(p_group_count, p_group_scores, run_get_group_scores(state, re->group_scores)); - } - if (re->status == RUN_VIRTUAL_START || re->status == RUN_VIRTUAL_STOP) continue; if (re->prob_id != sample_re->prob_id) continue; if ((re->status == RUN_COMPILE_ERR) && skip_ce_flag) continue; @@ -975,13 +971,18 @@ run_get_attempts( } if (re->status == RUN_IGNORED) continue; if (re->is_hidden) continue; - if (re->status == RUN_OK || re->status == RUN_PENDING || re->status == RUN_SUMMONED) continue; if (re->status == RUN_REJECTED) continue; if (re->status == RUN_DISQUALIFIED) { m++; - } else { - n++; + continue; } + + if (group_merge_flag > 0 && re->group_scores) { + group_scores_merge_1(p_group_count, p_group_scores, run_get_group_scores(state, re->group_scores)); + } + + if (re->status == RUN_OK || re->status == RUN_PENDING || re->status == RUN_SUMMONED) continue; + ++n; } if (pattempts) *pattempts = n;