From 6b99cded3c487d45b9a005dcd4d2eaa075e33b2e Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Sat, 8 Dec 2018 19:36:31 +0800
Subject: [PATCH] Report subtask's progress in time

---
 src/daemon/judge/judger-base.ts | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/daemon/judge/judger-base.ts b/src/daemon/judge/judger-base.ts
index ec94bde..55035a2 100644
--- a/src/daemon/judge/judger-base.ts
+++ b/src/daemon/judge/judger-base.ts
@@ -33,10 +33,27 @@ export abstract class JudgerBase {
     async judge(reportProgressResult: (p: JudgeResult) => Promise<void>): Promise<JudgeResult> {
         const results: SubtaskResult[] = this.testData.subtasks.map(t => ({
             cases: t.cases.map(j => ({
-                status: TaskStatus.Waiting
+                status: TaskStatus.Waiting,
+                result: { scoringRate: t.type !== SubtaskScoringType.Summation ? 1 : 0 } as any
             })),
             status: TaskStatus.Waiting
         }));
+
+        const updateSubtaskScore = (currentTask, currentResult) => {
+            if (currentResult.cases.some(c => c.status === TaskStatus.Failed)) {
+                // If any testcase has failed, the score is invaild.
+                currentResult.score = NaN;
+            } else {
+                currentResult.score = calculateSubtaskScore(currentTask.type, currentResult.cases.map(c => c.result ? c.result.scoringRate : 0)) * currentTask.score;
+            }
+        }
+
+        for (let subtaskIndex = 0; subtaskIndex < this.testData.subtasks.length; subtaskIndex++) {
+            const currentResult = results[subtaskIndex];
+            const currentTask = this.testData.subtasks[subtaskIndex];
+            updateSubtaskScore(currentTask, currentResult);
+        }
+
         const reportProgress = function () {
             reportProgressResult({ subtasks: results });
         }
@@ -47,6 +64,8 @@ export abstract class JudgerBase {
             const currentResult = results[subtaskIndex];
             const currentTask = this.testData.subtasks[subtaskIndex];
 
+            const updateCurrentSubtaskScore = () => updateSubtaskScore(currentTask, currentResult);
+
             judgeTasks.push((async () => {
                 // Type minimum is skippable, run one by one
                 if (currentTask.type !== SubtaskScoringType.Summation) {
@@ -75,6 +94,7 @@ export abstract class JudgerBase {
                                 winston.debug(`Subtask ${subtaskIndex}, case ${index}: zero, skipping the rest.`);
                                 skipped = true;
                             }
+                            updateCurrentSubtaskScore();
                             await reportProgress();
                         }
                     }
@@ -96,17 +116,13 @@ export abstract class JudgerBase {
                                 currentTaskResult.errorMessage = err.toString();
                                 winston.warn(`Task runner error: ${err.toString()} (subtask ${subtaskIndex}, case ${index})`);
                             }
+                            updateCurrentSubtaskScore();
                             await reportProgress();
                         })());
                     }
                     await Promise.all(caseTasks);
                 }
-                if (currentResult.cases.some(c => c.status === TaskStatus.Failed)) {
-                    // If any testcase has failed, the score is invaild.
-                    currentResult.score = NaN;
-                } else {
-                    currentResult.score = calculateSubtaskScore(currentTask.type, currentResult.cases.map(c => c.result ? c.result.scoringRate : 0)) * currentTask.score;
-                }
+                updateCurrentSubtaskScore();
                 winston.verbose(`Subtask ${subtaskIndex}, finished`);
             })());
         }
@@ -116,4 +132,4 @@ export abstract class JudgerBase {
     protected abstract judgeTestcase(curCase: TestcaseJudge, started: () => Promise<void>): Promise<TestcaseDetails>;
 
     async cleanup() { }
-}
\ No newline at end of file
+}