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: enhanced contest first-blood detect

Browse Source
This commit is contained in:
undefined committed 2022-03-13 21:04:57 +08:00
1 parent 15d26eec37
commit 5bb847c5b2
2 files changed
+22 -20
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.9.3", "version": "3.9.4",
"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
+21 -19
View File
@@ -122,16 +122,20 @@ const acm = buildContestRule({
// Find first accept // Find first accept
const first = {}; const first = {};
for (const pid of tdoc.pids) first[pid] = new ObjectID().generationTime; const data = await document.collStatus.aggregate([
for (const [, tsdoc] of rankedTsdocs) { {
const tsddict = {}; $match: {
for (const item of tsdoc.detail || []) tsddict[item.pid] = item; domainId: tdoc.domainId, docType: document.TYPE_CONTEST, docId: tdoc.docId,
for (const pid of tdoc.pids) { accept: { $gte: 1 },
if (tsddict[pid]?.status === STATUS.STATUS_ACCEPTED && tsddict[pid].rid.generationTime < first[pid]) { detail: { $elemMatch: { status: STATUS.STATUS_ACCEPTED } },
first[pid] = tsddict[pid].rid.generationTime; },
} },
} { $unwind: '$detail' },
} { $match: { 'detail.status': STATUS.STATUS_ACCEPTED } },
{ $sort: { 'detail.rid': 1 } },
{ $group: { _id: '$detail.pid', first: { $first: '$detail.rid' } } },
]).toArray();
for (const t of data) first[t._id] = t.first.generationTime;
const rows: ScoreboardRow[] = [columns]; const rows: ScoreboardRow[] = [columns];
for (const [rank, tsdoc] of rankedTsdocs) { for (const [rank, tsdoc] of rankedTsdocs) {
@@ -192,7 +196,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]?.status !== STATUS.STATUS_ACCEPTED || 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 };
@@ -225,15 +229,13 @@ const oi = buildContestRule({
} }
const psdict = {}; const psdict = {};
const first = {}; const first = {};
for (const pid of tdoc.pids) first[pid] = new ObjectID().generationTime;
for (const [, tsdoc] of rankedTsdocs) {
const tsddict = {};
for (const item of tsdoc.journal || []) tsddict[item.pid] = item;
for (const pid of tdoc.pids) { for (const pid of tdoc.pids) {
if (tsddict[pid]?.status === STATUS.STATUS_ACCEPTED && tsddict[pid].rid.generationTime < first[pid]) { // eslint-disable-next-line @typescript-eslint/no-use-before-define
first[pid] = tsddict[pid].rid.generationTime; const [data] = await getMultiStatus(tdoc.domainId, {
} docType: document.TYPE_CONTEST, docId: tdoc.docId,
} [`detail.${pid}.status`]: STATUS.STATUS_ACCEPTED,
}).sort({ [`detail.${pid}.rid`]: 1 }).limit(1).toArray();
first[pid] = data ? data.detail[pid].rid.generationTime : new ObjectID().generationTime;
} }
// eslint-disable-next-line @typescript-eslint/no-use-before-define // eslint-disable-next-line @typescript-eslint/no-use-before-define
if (isDone(tdoc)) { if (isDone(tdoc)) {