@xcpcio/core 0.27.0 → 0.28.0

package/dist/index.cjs

@@ -755,6 +755,7 @@ class Submission {
     this.teamId = "";
     this.problemId = "";
     this.timestamp = 0;
+    this.timestampUnit = "second";
   }
   isAccepted() {
     return isAccepted(this.status);
@@ -769,8 +770,46 @@ class Submission {
     return isNotCalculatedPenaltyStatus(this.status);
   }
   get timestampToMinute() {
+    if (this.timestampUnit === "nanosecond") {
+      return Math.floor(this.timestamp / 60 / 1e3 / 1e3 / 1e3);
+    }
+    if (this.timestampUnit === "microsecond") {
+      return Math.floor(this.timestamp / 60 / 1e3 / 1e3);
+    }
+    if (this.timestampUnit === "millisecond") {
+      return Math.floor(this.timestamp / 60 / 1e3);
+    }
     return Math.floor(this.timestamp / 60);
   }
+  get timestampToSecond() {
+    if (this.timestampUnit === "nanosecond") {
+      return Math.floor(this.timestamp / 1e3 / 1e3 / 1e3);
+    }
+    if (this.timestampUnit === "microsecond") {
+      return Math.floor(this.timestamp / 1e3 / 1e3);
+    }
+    if (this.timestampUnit === "millisecond") {
+      return Math.floor(this.timestamp / 1e3);
+    }
+    return this.timestamp;
+  }
+  get timestampDisplayFormatWithSecond() {
+    const second = this.timestampToSecond;
+    const h = Math.floor(second / 3600);
+    const m = Math.floor(second % 3600 / 60);
+    const s = second % 60;
+    const f = (x) => x.toString().padStart(2, "0");
+    const res = `${f(h)}:${f(m)}:${f(s)}`;
+    return res;
+  }
+  get timestampDisplayFormatWithMilliSecond() {
+    let res = this.timestampDisplayFormatWithSecond;
+    if (this.timestampUnit === "millisecond") {
+      const fl = (this.timestamp % 1e3).toString().padEnd(3, "0");
+      res += `.${fl}`;
+    }
+    return res;
+  }
   static compare(lhs, rhs) {
     if (lhs.timestamp !== rhs.timestamp) {
       return lhs.timestamp - rhs.timestamp;
@@ -794,6 +833,12 @@ function createSubmission(submissionJSON) {
   s.timestamp = submissionJSON.timestamp;
   s.status = stringToSubmissionStatus(submissionJSON.status);
   s.isIgnore = submissionJSON.is_ignore ?? false;
+  if (submissionJSON.time) {
+    s.time = submissionJSON.time;
+  }
+  if (submissionJSON.language) {
+    s.language = submissionJSON.language;
+  }
   return s;
 }
 function createSubmissions(submissionsJSON) {
@@ -829,6 +874,9 @@ class Group {
 class ContestOptions {
   constructor() {
     this.calculationOfPenalty = "in_minutes";
+    this.submissionTimestampUnit = "second";
+    this.submissionHasTimeField = false;
+    this.submissionHasLanguageField = false;
   }
 }
 function createContestOptions(contestOptionsJSON = {}) {
@@ -837,6 +885,9 @@ function createContestOptions(contestOptionsJSON = {}) {
   if (j.calculation_of_penalty) {
     o.calculationOfPenalty = j.calculation_of_penalty;
   }
+  if (j.submission_timestamp_unit) {
+    o.submissionTimestampUnit = j.submission_timestamp_unit;
+  }
   return o;
 }
 
@@ -1190,6 +1241,16 @@ class Rank {
     this.teams = ___default.cloneDeep(teams);
     this.teamsMap = new Map(this.teams.map((t) => [t.id, t]));
     this.submissions = ___default.cloneDeep(submissions).sort(Submission.compare);
+    this.submissions.forEach((s) => {
+      const o = this.contest.options;
+      s.timestampUnit = o.submissionTimestampUnit;
+      if (s.time) {
+        o.submissionHasTimeField = true;
+      }
+      if (s.language) {
+        o.submissionHasLanguageField = true;
+      }
+    });
     this.submissionsMap = new Map(this.submissions.map((s) => [s.id, s]));
     this.organizations = this.buildOrganizations();
     this.originTeams = this.teams.map((t) => t);
@@ -1263,11 +1324,11 @@ class Rank {
             return;
           }
           problemStatistics.isSubmitted = true;
-          problemStatistics.lastSubmitTimestamp = s.timestamp;
+          problemStatistics.lastSubmitTimestamp = s.timestampToSecond;
           problemStatistics.totalCount++;
           if (s.isAccepted()) {
             problemStatistics.isSolved = true;
-            problemStatistics.solvedTimestamp = s.timestamp;
+            problemStatistics.solvedTimestamp = s.timestampToSecond;
             problem.statistics.acceptedNum++;
             problem.statistics.attemptedNum += problemStatistics.failedCount + 1;
             if (problem.statistics.firstSolveSubmissions.length === 0 || problem.statistics.firstSolveSubmissions[problem.statistics.firstSolveSubmissions.length - 1].timestamp === s.timestamp) {
@@ -1279,7 +1340,7 @@ class Rank {
             }
             problem.statistics.lastSolveSubmissions.push(s);
             team.lastSolvedProblem = problem;
-            team.lastSolvedProblemTimestamp = s.timestamp;
+            team.lastSolvedProblemTimestamp = s.timestampToSecond;
           }
           if (s.isRejected()) {
             problemStatistics.failedCount++;
@@ -1400,7 +1461,7 @@ class Rank {
       return this.submissions;
     }
     return this.submissions.filter(
-      (s) => s.timestamp <= this.options.timestamp
+      (s) => s.timestampToSecond <= this.options.timestamp
     ).sort(Submission.compare);
   }
   buildBalloons() {
@@ -1423,7 +1484,7 @@ class Rank {
         }
         if (s.isAccepted()) {
           problemStatistics.isSolved = true;
-          problemStatistics.solvedTimestamp = s.timestamp;
+          problemStatistics.solvedTimestamp = s.timestampToSecond;
           const b = new Balloon();
           b.team = team;
           b.problem = problem;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, Lang, CalculationOfPenalty, StatusTimeDisplay, Image, ContestState, Contest as Contest$1, Team as Team$1, Teams as Teams$1, ContestIndex as ContestIndex$1 } from '@xcpcio/types';
+import { TimeUnit, SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, Lang, CalculationOfPenalty, StatusTimeDisplay, Image, ContestState, Contest as Contest$1, Team as Team$1, Teams as Teams$1, ContestIndex as ContestIndex$1 } from '@xcpcio/types';
 import dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
 import * as XLSX from 'xlsx-js-style';
@@ -8,6 +8,9 @@ declare class Submission {
     teamId: string;
     problemId: string;
     timestamp: number;
+    timestampUnit: TimeUnit;
+    time?: number;
+    language?: string;
     status: SubmissionStatus;
     isIgnore: boolean;
     constructor();
@@ -16,6 +19,9 @@ declare class Submission {
     isPending(): boolean;
     isNotCalculatedPenaltyStatus(): boolean;
     get timestampToMinute(): number;
+    get timestampToSecond(): number;
+    get timestampDisplayFormatWithSecond(): string;
+    get timestampDisplayFormatWithMilliSecond(): string;
     static compare(lhs: Submission, rhs: Submission): number;
 }
 type Submissions = Array<Submission>;
@@ -106,6 +112,9 @@ type Awards = Map<string, Award[]>;
 
 declare class ContestOptions {
     calculationOfPenalty: CalculationOfPenalty;
+    submissionTimestampUnit: TimeUnit;
+    submissionHasTimeField: boolean;
+    submissionHasLanguageField: boolean;
     constructor();
 }
 

package/dist/index.mjs

@@ -725,6 +725,7 @@ class Submission {
     this.teamId = "";
     this.problemId = "";
     this.timestamp = 0;
+    this.timestampUnit = "second";
   }
   isAccepted() {
     return isAccepted(this.status);
@@ -739,8 +740,46 @@ class Submission {
     return isNotCalculatedPenaltyStatus(this.status);
   }
   get timestampToMinute() {
+    if (this.timestampUnit === "nanosecond") {
+      return Math.floor(this.timestamp / 60 / 1e3 / 1e3 / 1e3);
+    }
+    if (this.timestampUnit === "microsecond") {
+      return Math.floor(this.timestamp / 60 / 1e3 / 1e3);
+    }
+    if (this.timestampUnit === "millisecond") {
+      return Math.floor(this.timestamp / 60 / 1e3);
+    }
     return Math.floor(this.timestamp / 60);
   }
+  get timestampToSecond() {
+    if (this.timestampUnit === "nanosecond") {
+      return Math.floor(this.timestamp / 1e3 / 1e3 / 1e3);
+    }
+    if (this.timestampUnit === "microsecond") {
+      return Math.floor(this.timestamp / 1e3 / 1e3);
+    }
+    if (this.timestampUnit === "millisecond") {
+      return Math.floor(this.timestamp / 1e3);
+    }
+    return this.timestamp;
+  }
+  get timestampDisplayFormatWithSecond() {
+    const second = this.timestampToSecond;
+    const h = Math.floor(second / 3600);
+    const m = Math.floor(second % 3600 / 60);
+    const s = second % 60;
+    const f = (x) => x.toString().padStart(2, "0");
+    const res = `${f(h)}:${f(m)}:${f(s)}`;
+    return res;
+  }
+  get timestampDisplayFormatWithMilliSecond() {
+    let res = this.timestampDisplayFormatWithSecond;
+    if (this.timestampUnit === "millisecond") {
+      const fl = (this.timestamp % 1e3).toString().padEnd(3, "0");
+      res += `.${fl}`;
+    }
+    return res;
+  }
   static compare(lhs, rhs) {
     if (lhs.timestamp !== rhs.timestamp) {
       return lhs.timestamp - rhs.timestamp;
@@ -764,6 +803,12 @@ function createSubmission(submissionJSON) {
   s.timestamp = submissionJSON.timestamp;
   s.status = stringToSubmissionStatus(submissionJSON.status);
   s.isIgnore = submissionJSON.is_ignore ?? false;
+  if (submissionJSON.time) {
+    s.time = submissionJSON.time;
+  }
+  if (submissionJSON.language) {
+    s.language = submissionJSON.language;
+  }
   return s;
 }
 function createSubmissions(submissionsJSON) {
@@ -799,6 +844,9 @@ class Group {
 class ContestOptions {
   constructor() {
     this.calculationOfPenalty = "in_minutes";
+    this.submissionTimestampUnit = "second";
+    this.submissionHasTimeField = false;
+    this.submissionHasLanguageField = false;
   }
 }
 function createContestOptions(contestOptionsJSON = {}) {
@@ -807,6 +855,9 @@ function createContestOptions(contestOptionsJSON = {}) {
   if (j.calculation_of_penalty) {
     o.calculationOfPenalty = j.calculation_of_penalty;
   }
+  if (j.submission_timestamp_unit) {
+    o.submissionTimestampUnit = j.submission_timestamp_unit;
+  }
   return o;
 }
 
@@ -1160,6 +1211,16 @@ class Rank {
     this.teams = _.cloneDeep(teams);
     this.teamsMap = new Map(this.teams.map((t) => [t.id, t]));
     this.submissions = _.cloneDeep(submissions).sort(Submission.compare);
+    this.submissions.forEach((s) => {
+      const o = this.contest.options;
+      s.timestampUnit = o.submissionTimestampUnit;
+      if (s.time) {
+        o.submissionHasTimeField = true;
+      }
+      if (s.language) {
+        o.submissionHasLanguageField = true;
+      }
+    });
     this.submissionsMap = new Map(this.submissions.map((s) => [s.id, s]));
     this.organizations = this.buildOrganizations();
     this.originTeams = this.teams.map((t) => t);
@@ -1233,11 +1294,11 @@ class Rank {
             return;
           }
           problemStatistics.isSubmitted = true;
-          problemStatistics.lastSubmitTimestamp = s.timestamp;
+          problemStatistics.lastSubmitTimestamp = s.timestampToSecond;
           problemStatistics.totalCount++;
           if (s.isAccepted()) {
             problemStatistics.isSolved = true;
-            problemStatistics.solvedTimestamp = s.timestamp;
+            problemStatistics.solvedTimestamp = s.timestampToSecond;
             problem.statistics.acceptedNum++;
             problem.statistics.attemptedNum += problemStatistics.failedCount + 1;
             if (problem.statistics.firstSolveSubmissions.length === 0 || problem.statistics.firstSolveSubmissions[problem.statistics.firstSolveSubmissions.length - 1].timestamp === s.timestamp) {
@@ -1249,7 +1310,7 @@ class Rank {
             }
             problem.statistics.lastSolveSubmissions.push(s);
             team.lastSolvedProblem = problem;
-            team.lastSolvedProblemTimestamp = s.timestamp;
+            team.lastSolvedProblemTimestamp = s.timestampToSecond;
           }
           if (s.isRejected()) {
             problemStatistics.failedCount++;
@@ -1370,7 +1431,7 @@ class Rank {
       return this.submissions;
     }
     return this.submissions.filter(
-      (s) => s.timestamp <= this.options.timestamp
+      (s) => s.timestampToSecond <= this.options.timestamp
     ).sort(Submission.compare);
   }
   buildBalloons() {
@@ -1393,7 +1454,7 @@ class Rank {
         }
         if (s.isAccepted()) {
           problemStatistics.isSolved = true;
-          problemStatistics.solvedTimestamp = s.timestamp;
+          problemStatistics.solvedTimestamp = s.timestampToSecond;
           const b = new Balloon();
           b.team = team;
           b.problem = problem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xcpcio/core",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "XCPCIO Core",
   "author": "Dup4 <lyuzhi.pan@gmail.com>",
   "license": "MIT",
@@ -44,7 +44,7 @@
     "lodash": "^4.17.21",
     "string-width": "^6.1.0",
     "xlsx-js-style": "^1.2.0",
-    "@xcpcio/types": "0.27.0"
+    "@xcpcio/types": "0.28.0"
   },
   "devDependencies": {
     "@babel/types": "^7.22.4",

package/src/contest-options.ts

@@ -1,10 +1,18 @@
-import type { CalculationOfPenalty, ContestOptions as IContestOptions } from "@xcpcio/types";
+import type { CalculationOfPenalty, ContestOptions as IContestOptions, TimeUnit } from "@xcpcio/types";
 
 export class ContestOptions {
   calculationOfPenalty: CalculationOfPenalty;
+  submissionTimestampUnit: TimeUnit;
+
+  submissionHasTimeField: boolean;
+  submissionHasLanguageField: boolean;
 
   constructor() {
     this.calculationOfPenalty = "in_minutes";
+    this.submissionTimestampUnit = "second";
+
+    this.submissionHasTimeField = false;
+    this.submissionHasLanguageField = false;
   }
 }
 
@@ -16,5 +24,9 @@ export function createContestOptions(contestOptionsJSON: IContestOptions = {}):
     o.calculationOfPenalty = j.calculation_of_penalty;
   }
 
+  if (j.submission_timestamp_unit) {
+    o.submissionTimestampUnit = j.submission_timestamp_unit;
+  }
+
   return o;
 }

package/src/rank.ts

@@ -136,6 +136,21 @@ export class Rank {
     this.teamsMap = new Map(this.teams.map(t => [t.id, t]));
 
     this.submissions = _.cloneDeep(submissions).sort(Submission.compare);
+
+    this.submissions.forEach((s) => {
+      const o = this.contest.options;
+
+      s.timestampUnit = o.submissionTimestampUnit;
+
+      if (s.time) {
+        o.submissionHasTimeField = true;
+      }
+
+      if (s.language) {
+        o.submissionHasLanguageField = true;
+      }
+    });
+
     this.submissionsMap = new Map(this.submissions.map(s => [s.id, s]));
 
     this.organizations = this.buildOrganizations();
@@ -233,12 +248,12 @@ export class Rank {
           }
 
           problemStatistics.isSubmitted = true;
-          problemStatistics.lastSubmitTimestamp = s.timestamp;
+          problemStatistics.lastSubmitTimestamp = s.timestampToSecond;
           problemStatistics.totalCount++;
 
           if (s.isAccepted()) {
             problemStatistics.isSolved = true;
-            problemStatistics.solvedTimestamp = s.timestamp;
+            problemStatistics.solvedTimestamp = s.timestampToSecond;
 
             problem.statistics.acceptedNum++;
             problem.statistics.attemptedNum += problemStatistics.failedCount + 1;
@@ -258,7 +273,7 @@ export class Rank {
             problem.statistics.lastSolveSubmissions.push(s);
 
             team.lastSolvedProblem = problem;
-            team.lastSolvedProblemTimestamp = s.timestamp;
+            team.lastSolvedProblemTimestamp = s.timestampToSecond;
           }
 
           if (s.isRejected()) {
@@ -412,7 +427,7 @@ export class Rank {
     }
 
     return this.submissions.filter(s =>
-      s.timestamp <= this.options.timestamp,
+      s.timestampToSecond <= this.options.timestamp,
     ).sort(Submission.compare);
   }
 
@@ -443,7 +458,7 @@ export class Rank {
 
         if (s.isAccepted()) {
           problemStatistics.isSolved = true;
-          problemStatistics.solvedTimestamp = s.timestamp;
+          problemStatistics.solvedTimestamp = s.timestampToSecond;
 
           const b = new Balloon();
           b.team = team;

package/src/submission.ts

@@ -1,4 +1,4 @@
-import type { Submission as ISubmission, Submissions as ISubmissions } from "@xcpcio/types";
+import type { Submission as ISubmission, Submissions as ISubmissions, TimeUnit } from "@xcpcio/types";
 import { SubmissionStatus } from "@xcpcio/types";
 
 import {
@@ -14,6 +14,10 @@ export class Submission {
   teamId: string;
   problemId: string;
   timestamp: number;
+  timestampUnit: TimeUnit;
+
+  time?: number;
+  language?: string;
 
   status = SubmissionStatus.UNKNOWN;
   isIgnore = false;
@@ -23,6 +27,7 @@ export class Submission {
     this.teamId = "";
     this.problemId = "";
     this.timestamp = 0;
+    this.timestampUnit = "second";
   }
 
   isAccepted() {
@@ -42,9 +47,62 @@ export class Submission {
   }
 
   get timestampToMinute() {
+    if (this.timestampUnit === "nanosecond") {
+      return Math.floor(this.timestamp / 60 / 1000 / 1000 / 1000);
+    }
+
+    if (this.timestampUnit === "microsecond") {
+      return Math.floor(this.timestamp / 60 / 1000 / 1000);
+    }
+
+    if (this.timestampUnit === "millisecond") {
+      return Math.floor(this.timestamp / 60 / 1000);
+    }
+
     return Math.floor(this.timestamp / 60);
   }
 
+  get timestampToSecond() {
+    if (this.timestampUnit === "nanosecond") {
+      return Math.floor(this.timestamp / 1000 / 1000 / 1000);
+    }
+
+    if (this.timestampUnit === "microsecond") {
+      return Math.floor(this.timestamp / 1000 / 1000);
+    }
+
+    if (this.timestampUnit === "millisecond") {
+      return Math.floor(this.timestamp / 1000);
+    }
+
+    return this.timestamp;
+  }
+
+  get timestampDisplayFormatWithSecond(): string {
+    const second = this.timestampToSecond;
+
+    const h = Math.floor(second / 3600);
+    const m = Math.floor(second % 3600 / 60);
+    const s = second % 60;
+
+    const f = (x: number) => x.toString().padStart(2, "0");
+
+    const res = `${f(h)}:${f(m)}:${f(s)}`;
+
+    return res;
+  }
+
+  get timestampDisplayFormatWithMilliSecond(): string {
+    let res = this.timestampDisplayFormatWithSecond;
+
+    if (this.timestampUnit === "millisecond") {
+      const fl = (this.timestamp % 1000).toString().padEnd(3, "0");
+      res += `.${fl}`;
+    }
+
+    return res;
+  }
+
   static compare(lhs: Submission, rhs: Submission): number {
     if (lhs.timestamp !== rhs.timestamp) {
       return lhs.timestamp - rhs.timestamp;
@@ -76,6 +134,14 @@ export function createSubmission(submissionJSON: ISubmission): Submission {
   s.status = stringToSubmissionStatus(submissionJSON.status);
   s.isIgnore = submissionJSON.is_ignore ?? false;
 
+  if (submissionJSON.time) {
+    s.time = submissionJSON.time;
+  }
+
+  if (submissionJSON.language) {
+    s.language = submissionJSON.language;
+  }
+
   return s;
 }