@xcpcio/core 0.24.0 → 0.25.0

package/dist/index.cjs

@@ -569,6 +569,12 @@ class TeamProblemStatistics {
   get penaltyToMinute() {
     return Math.floor(this.penalty / 60);
   }
+  get penaltyInSecond() {
+    if (this.isSolved === false) {
+      return 0;
+    }
+    return this.solvedTimestamp + this.failedCount * this.contestPenalty;
+  }
 }
 
 class PlaceChartPointData {
@@ -628,7 +634,7 @@ class Team {
     }
     return this.members?.join(", ");
   }
-  calcSolvedData() {
+  calcSolvedData(options) {
     this.solvedProblemNum = 0;
     this.attemptedProblemNum = 0;
     this.penalty = 0;
@@ -636,9 +642,16 @@ class Team {
       if (p.isAccepted) {
         this.solvedProblemNum++;
         this.attemptedProblemNum += p.failedCount + 1;
-        this.penalty += p.penalty;
+        if (options?.calculationOfPenalty === "in_seconds" || options?.calculationOfPenalty === "accumulate_in_seconds_and_finally_to_the_minute") {
+          this.penalty += p.penaltyInSecond;
+        } else {
+          this.penalty += p.penalty;
+        }
       }
     }
+    if (options?.calculationOfPenalty === "accumulate_in_seconds_and_finally_to_the_minute") {
+      this.penalty = Math.floor(this.penalty / 60) * 60;
+    }
   }
   calcAwards(awards) {
     if (!awards) {
@@ -813,6 +826,20 @@ class Group {
   }
 }
 
+class ContestOptions {
+  constructor() {
+    this.calculationOfPenalty = "in_minutes";
+  }
+}
+function createContestOptions(contestOptionsJSON = {}) {
+  const j = contestOptionsJSON;
+  const o = new ContestOptions();
+  if (j.calculation_of_penalty) {
+    o.calculationOfPenalty = j.calculation_of_penalty;
+  }
+  return o;
+}
+
 class Contest {
   constructor() {
     this.name = "";
@@ -832,6 +859,7 @@ class Contest {
     };
     this.group = /* @__PURE__ */ new Map();
     this.tag = /* @__PURE__ */ new Map();
+    this.options = new ContestOptions();
   }
   getContestDuration(timeFormat = "HH:mm:ss") {
     return dayjs__default.duration(this.endTime.diff(this.startTime)).format(timeFormat);
@@ -998,6 +1026,9 @@ function createContest(contestJSON) {
   c.banner = contestJSON.banner;
   c.logo = contestJSON.logo;
   c.boardLink = contestJSON.board_link;
+  if (contestJSON.options) {
+    c.options = createContestOptions(contestJSON.options);
+  }
   return c;
 }
 
@@ -1260,7 +1291,7 @@ class Rank {
           }
         })();
         if (s.timestampToMinute > preSubmissionTimestampToMinute || ix === allSubmissions.length - 1) {
-          this.teams.forEach((t) => t.calcSolvedData());
+          this.teams.forEach((t) => t.calcSolvedData(this.contest.options));
           this.teams.sort(Team.compare);
           this.buildTeamRank();
           this.teams.forEach(
@@ -1275,7 +1306,7 @@ class Rank {
         }
         preSubmissionTimestampToMinute = s.timestampToMinute;
       }
-      this.teams.forEach((t) => t.calcSolvedData());
+      this.teams.forEach((t) => t.calcSolvedData(this.contest.options));
       this.teams.sort(Team.compare);
       this.buildTeamRank();
       this.buildOrgRank();
@@ -1474,7 +1505,7 @@ class Resolver extends Rank {
           op.afterTeamProblemStatistics = afterTeamProblemStatistics;
           this.operations.push(op);
           team.problemStatistics[problemIx] = afterTeamProblemStatistics;
-          team.calcSolvedData();
+          team.calcSolvedData(this.contest.options);
           break;
         }
         {
@@ -1499,6 +1530,7 @@ exports.CodeforcesGymGhostDATConverter = CodeforcesGymGhostDATConverter;
 exports.Contest = Contest;
 exports.ContestIndex = ContestIndex;
 exports.ContestIndexConfig = ContestIndexConfig;
+exports.ContestOptions = ContestOptions;
 exports.GeneralExcelConverter = GeneralExcelConverter;
 exports.MedalType = MedalType;
 exports.PlaceChartPointData = PlaceChartPointData;

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, StatusTimeDisplay, Image, ContestState, Contest as Contest$1, Team as Team$1, Teams as Teams$1, ContestIndex as ContestIndex$1 } from '@xcpcio/types';
+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 dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
 import * as XLSX from 'xlsx-js-style';
@@ -72,6 +72,7 @@ declare class TeamProblemStatistics {
     get solvedTimestampToMinute(): number;
     get penalty(): number;
     get penaltyToMinute(): number;
+    get penaltyInSecond(): number;
 }
 
 declare function calcDirt(attemptedNum: number, solvedNum: number): number;
@@ -103,6 +104,11 @@ declare class Award {
 declare function isValidMedalType(medal: MedalType): boolean;
 type Awards = Map<string, Award[]>;
 
+declare class ContestOptions {
+    calculationOfPenalty: CalculationOfPenalty;
+    constructor();
+}
+
 declare class Contest {
     name: string;
     startTime: dayjs.Dayjs;
@@ -124,6 +130,7 @@ declare class Contest {
     logo?: Image;
     banner?: Image;
     boardLink?: string;
+    options: ContestOptions;
     constructor();
     getContestDuration(timeFormat?: string): string;
     getContestState(nowTime?: Date): ContestState;
@@ -169,7 +176,7 @@ declare class Team {
     get penaltyToMinute(): number;
     get dirt(): number;
     get membersToString(): string | undefined;
-    calcSolvedData(): void;
+    calcSolvedData(options: ContestOptions): void;
     calcAwards(awards?: Award[]): void;
     isEqualRank(otherTeam: Team): boolean;
     postProcessPlaceChartPoints(): void;
@@ -302,4 +309,4 @@ declare function isRejected(status: SubmissionStatus): boolean;
 declare function isPending(status: SubmissionStatus): boolean;
 declare function isNotCalculatedPenaltyStatus(status: SubmissionStatus): boolean;
 
-export { Award, Awards, Balloon, Balloons, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestIndexList, GeneralExcelConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Problems, Rank, RankOptions, RankStatistics, Resolver, SelectOptionItem, Submission, Submissions, Team, TeamProblemStatistics, Teams, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
+export { Award, Awards, Balloon, Balloons, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestIndexList, ContestOptions, GeneralExcelConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Problems, Rank, RankOptions, RankStatistics, Resolver, SelectOptionItem, Submission, Submissions, Team, TeamProblemStatistics, Teams, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };

package/dist/index.mjs

@@ -539,6 +539,12 @@ class TeamProblemStatistics {
   get penaltyToMinute() {
     return Math.floor(this.penalty / 60);
   }
+  get penaltyInSecond() {
+    if (this.isSolved === false) {
+      return 0;
+    }
+    return this.solvedTimestamp + this.failedCount * this.contestPenalty;
+  }
 }
 
 class PlaceChartPointData {
@@ -598,7 +604,7 @@ class Team {
     }
     return this.members?.join(", ");
   }
-  calcSolvedData() {
+  calcSolvedData(options) {
     this.solvedProblemNum = 0;
     this.attemptedProblemNum = 0;
     this.penalty = 0;
@@ -606,9 +612,16 @@ class Team {
       if (p.isAccepted) {
         this.solvedProblemNum++;
         this.attemptedProblemNum += p.failedCount + 1;
-        this.penalty += p.penalty;
+        if (options?.calculationOfPenalty === "in_seconds" || options?.calculationOfPenalty === "accumulate_in_seconds_and_finally_to_the_minute") {
+          this.penalty += p.penaltyInSecond;
+        } else {
+          this.penalty += p.penalty;
+        }
       }
     }
+    if (options?.calculationOfPenalty === "accumulate_in_seconds_and_finally_to_the_minute") {
+      this.penalty = Math.floor(this.penalty / 60) * 60;
+    }
   }
   calcAwards(awards) {
     if (!awards) {
@@ -783,6 +796,20 @@ class Group {
   }
 }
 
+class ContestOptions {
+  constructor() {
+    this.calculationOfPenalty = "in_minutes";
+  }
+}
+function createContestOptions(contestOptionsJSON = {}) {
+  const j = contestOptionsJSON;
+  const o = new ContestOptions();
+  if (j.calculation_of_penalty) {
+    o.calculationOfPenalty = j.calculation_of_penalty;
+  }
+  return o;
+}
+
 class Contest {
   constructor() {
     this.name = "";
@@ -802,6 +829,7 @@ class Contest {
     };
     this.group = /* @__PURE__ */ new Map();
     this.tag = /* @__PURE__ */ new Map();
+    this.options = new ContestOptions();
   }
   getContestDuration(timeFormat = "HH:mm:ss") {
     return dayjs.duration(this.endTime.diff(this.startTime)).format(timeFormat);
@@ -968,6 +996,9 @@ function createContest(contestJSON) {
   c.banner = contestJSON.banner;
   c.logo = contestJSON.logo;
   c.boardLink = contestJSON.board_link;
+  if (contestJSON.options) {
+    c.options = createContestOptions(contestJSON.options);
+  }
   return c;
 }
 
@@ -1230,7 +1261,7 @@ class Rank {
           }
         })();
         if (s.timestampToMinute > preSubmissionTimestampToMinute || ix === allSubmissions.length - 1) {
-          this.teams.forEach((t) => t.calcSolvedData());
+          this.teams.forEach((t) => t.calcSolvedData(this.contest.options));
           this.teams.sort(Team.compare);
           this.buildTeamRank();
           this.teams.forEach(
@@ -1245,7 +1276,7 @@ class Rank {
         }
         preSubmissionTimestampToMinute = s.timestampToMinute;
       }
-      this.teams.forEach((t) => t.calcSolvedData());
+      this.teams.forEach((t) => t.calcSolvedData(this.contest.options));
       this.teams.sort(Team.compare);
       this.buildTeamRank();
       this.buildOrgRank();
@@ -1444,7 +1475,7 @@ class Resolver extends Rank {
           op.afterTeamProblemStatistics = afterTeamProblemStatistics;
           this.operations.push(op);
           team.problemStatistics[problemIx] = afterTeamProblemStatistics;
-          team.calcSolvedData();
+          team.calcSolvedData(this.contest.options);
           break;
         }
         {
@@ -1462,4 +1493,4 @@ class Resolver extends Rank {
   }
 }
 
-export { Award, Balloon, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, GeneralExcelConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Resolver, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
+export { Award, Balloon, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestOptions, GeneralExcelConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Resolver, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xcpcio/core",
-  "version": "0.24.0",
+  "version": "0.25.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.24.0"
+    "@xcpcio/types": "0.25.0"
   },
   "devDependencies": {
     "@babel/types": "^7.22.4",

package/src/contest-options.ts

@@ -0,0 +1,20 @@
+import type { CalculationOfPenalty, ContestOptions as IContestOptions } from "@xcpcio/types";
+
+export class ContestOptions {
+  calculationOfPenalty: CalculationOfPenalty;
+
+  constructor() {
+    this.calculationOfPenalty = "in_minutes";
+  }
+}
+
+export function createContestOptions(contestOptionsJSON: IContestOptions = {}): ContestOptions {
+  const j = contestOptionsJSON;
+  const o = new ContestOptions();
+
+  if (j.calculation_of_penalty) {
+    o.calculationOfPenalty = j.calculation_of_penalty;
+  }
+
+  return o;
+}

package/src/contest.ts

@@ -7,6 +7,7 @@ import { createDayJS, dayjs, getTimeDiff } from "./utils";
 import { Group } from "./group";
 import { Award } from "./award";
 import { type Awards, MedalType } from "./award";
+import { ContestOptions, createContestOptions } from "./contest-options";
 
 export class Contest {
   name = "";
@@ -38,6 +39,8 @@ export class Contest {
   banner?: Image;
   boardLink?: string;
 
+  options: ContestOptions;
+
   constructor() {
     this.startTime = createDayJS();
     this.endTime = createDayJS();
@@ -61,6 +64,8 @@ export class Contest {
 
     this.group = new Map<string, Group>();
     this.tag = new Map<string, string>();
+
+    this.options = new ContestOptions();
   }
 
   getContestDuration(timeFormat = "HH:mm:ss"): string {
@@ -285,5 +290,10 @@ export function createContest(contestJSON: IContest): Contest {
   c.logo = contestJSON.logo;
   c.boardLink = contestJSON.board_link;
 
+  if (contestJSON.options) {
+    c.options = createContestOptions(contestJSON.options);
+  }
+
   return c;
 }
+export { ContestOptions };

package/src/problem.ts

@@ -197,4 +197,12 @@ export class TeamProblemStatistics {
   get penaltyToMinute() {
     return Math.floor(this.penalty / 60);
   }
+
+  get penaltyInSecond() {
+    if (this.isSolved === false) {
+      return 0;
+    }
+
+    return this.solvedTimestamp + this.failedCount * this.contestPenalty;
+  }
 }

package/src/rank.ts

@@ -273,7 +273,7 @@ export class Rank {
         })();
 
         if (s.timestampToMinute > preSubmissionTimestampToMinute || ix === allSubmissions.length - 1) {
-          this.teams.forEach(t => t.calcSolvedData());
+          this.teams.forEach(t => t.calcSolvedData(this.contest.options));
           this.teams.sort(Team.compare);
           this.buildTeamRank();
 
@@ -291,7 +291,7 @@ export class Rank {
         preSubmissionTimestampToMinute = s.timestampToMinute;
       }
 
-      this.teams.forEach(t => t.calcSolvedData());
+      this.teams.forEach(t => t.calcSolvedData(this.contest.options));
       this.teams.sort(Team.compare);
       this.buildTeamRank();
       this.buildOrgRank();

package/src/resolver.ts

@@ -100,7 +100,7 @@ export class Resolver extends Rank {
           this.operations.push(op);
 
           team.problemStatistics[problemIx] = afterTeamProblemStatistics;
-          team.calcSolvedData();
+          team.calcSolvedData(this.contest.options);
 
           break;
         }

package/src/team.ts

@@ -4,6 +4,7 @@ import type { Problem, TeamProblemStatistics } from "./problem";
 import { calcDirt } from "./utils";
 import type { Submissions } from "./submission";
 import type { Award, MedalType } from "./award";
+import type { ContestOptions } from "./contest-options";
 
 export class PlaceChartPointData {
   timePoint: number;
@@ -126,7 +127,7 @@ export class Team {
     return this.members?.join(", ");
   }
 
-  calcSolvedData() {
+  calcSolvedData(options: ContestOptions) {
     this.solvedProblemNum = 0;
     this.attemptedProblemNum = 0;
 
@@ -137,9 +138,18 @@ export class Team {
         this.solvedProblemNum++;
         this.attemptedProblemNum += p.failedCount + 1;
 
-        this.penalty += p.penalty;
+        if (options?.calculationOfPenalty === "in_seconds"
+         || options?.calculationOfPenalty === "accumulate_in_seconds_and_finally_to_the_minute") {
+          this.penalty += p.penaltyInSecond;
+        } else {
+          this.penalty += p.penalty;
+        }
       }
     }
+
+    if (options?.calculationOfPenalty === "accumulate_in_seconds_and_finally_to_the_minute") {
+      this.penalty = Math.floor(this.penalty / 60) * 60;
+    }
   }
 
   calcAwards(awards?: Award[]) {