Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: contest: ioi: fix rule context

Browse Source
This commit is contained in:
undefined committed 2022-04-09 15:14:14 +08:00
1 parent 5335763f57
commit d51c457b7c
2 files changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "3.11.13", "version": "3.11.14",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "src/loader", "main": "src/loader",
"module": "src/loader", "module": "src/loader",
packages/hydrooj/src/model/contest.ts
+6 -5
View File
@@ -32,9 +32,10 @@ interface AcmDetail extends AcmJournal {
} }
function buildContestRule<T>(def: ContestRule<T>): ContestRule<T> { function buildContestRule<T>(def: ContestRule<T>): ContestRule<T> {
def._originalRule = { scoreboard: def.scoreboard, stat: def.stat }; const _originalRule = { scoreboard: def.scoreboard, stat: def.stat };
def.scoreboard = (def._originalRule?.scoreboard || def.scoreboard).bind(def); def.scoreboard = (def._originalRule?.scoreboard || def.scoreboard).bind(def);
def.stat = (def._originalRule?.stat || def.stat).bind(def); def.stat = (def._originalRule?.stat || def.stat).bind(def);
def._originalRule = _originalRule;
return def; return def;
} }
@@ -189,7 +190,7 @@ const oi = buildContestRule({
const detail = {}; const detail = {};
let score = 0; let score = 0;
for (const j of journal.filter((i) => tdoc.pids.includes(i.pid))) { for (const j of journal.filter((i) => tdoc.pids.includes(i.pid))) {
if (detail[j.pid]?.status !== STATUS.STATUS_ACCEPTED || this.submitAfterAccept) detail[j.pid] = j; if ((detail[j.pid]?.score || 0) < j.score || this.submitAfterAccept) detail[j.pid] = j;
} }
for (const i in detail) score += detail[i].score; for (const i in detail) score += detail[i].score;
return { score, detail }; return { score, detail };
@@ -246,8 +247,8 @@ const oi = buildContestRule({
const rows: ScoreboardNode[][] = [columns]; const rows: ScoreboardNode[][] = [columns];
for (const [rank, tsdoc] of rankedTsdocs) { for (const [rank, tsdoc] of rankedTsdocs) {
const tsddict = {}; const tsddict = {};
if (tsdoc.journal) { for (const item of tsdoc.journal || []) {
for (const item of tsdoc.journal) tsddict[item.pid] = item; if ((tsddict[item.pid]?.score || 0) < item.score || this.submitAfterAccept) tsddict[item.pid] = item;
} }
const row: ScoreboardNode[] = [ const row: ScoreboardNode[] = [
{ type: 'string', value: rank.toString() }, { type: 'string', value: rank.toString() },
@@ -387,7 +388,7 @@ const homework = buildContestRule({
for (const [rank, tsdoc] of rankedTsdocs) { for (const [rank, tsdoc] of rankedTsdocs) {
const tsddict = {}; const tsddict = {};
for (const item of tsdoc.detail || []) { for (const item of tsdoc.detail || []) {
tsddict[item.pid] = item; if ((tsddict[item.pid].score || 0) <= item.score) tsddict[item.pid] = item;
} }
const row: ScoreboardRow = [ const row: ScoreboardRow = [
{ type: 'string', value: rank }, { type: 'string', value: rank },