Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions packages/hydrojudge/src/judge/default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ function judgeCase(c: NormalizedCase) {
addressSpaceLimit: address_space_limit,
processLimit: process_limit,
},
`judgeCase[${c.id}]${mp.i ? `[pass=${mp.i}]` : ''}<${ctx.rid}>`,
`judgeCase[${c.id}]${mp.i ? `{pass=${mp.i}}` : ''}<${ctx.rid}>`,
);
const {
code, signalled, time, memory, fileIds,
} = res;
let { status } = res;
let message: any = mp.i ? `[Pass ${mp.i}] ` : '';
let message: any = '';
let score = 0;
let nextPass: any;
if (status === STATUS.STATUS_ACCEPTED) {
Expand All @@ -38,7 +38,9 @@ function judgeCase(c: NormalizedCase) {
} else if (memory > c.memory * 1024) {
status = STATUS.STATUS_MEMORY_LIMIT_EXCEEDED;
} else {
const resChecker = await checkers[ctx.config.checker_type]({
({
status, score, message, nextPass,
} = await checkers[ctx.config.checker_type]({
execute: ctx.checker.execute,
copyIn: {
...ctx.checker.copyIn,
Expand All @@ -58,13 +60,13 @@ function judgeCase(c: NormalizedCase) {
HYDRO_MEMORY_USAGE: Math.floor(memory / 1024).toString(),
...(mp.i ? { HYDRO_MULTI_PASS: mp.i.toString() } : {}),
},
});
({ status, score, nextPass } = resChecker);
message += resChecker.message;
}));
if (mp.i && typeof message === 'string') message = `${message} [Pass ${mp.i}]`;
}
} else if (status === STATUS.STATUS_RUNTIME_ERROR && code && ctx.config.detail === 'full') {
if (code < 32 && signalled) message = signals[code];
else message = { message: `${message}Your program returned {0}.`, params: [code] };
else message = { message: 'Your program returned {0}.', params: [`${code}${mp.i ? ` [Pass ${mp.i}]` : ''}`] };
if (mp.i && typeof message === 'string') message = `${message} [Pass ${mp.i}]`;
}
if (nextPass) {
if (mp.i < ctx.config.multi_pass) {
Expand Down
Loading