@xcpcio/core 0.3.3 → 0.4.1

package/dist/index.cjs

@@ -27,6 +27,13 @@ const minMax__default = /*#__PURE__*/_interopDefaultLegacy(minMax);
 const relativeTime__default = /*#__PURE__*/_interopDefaultLegacy(relativeTime);
 const ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 
+function calcDict(attemptedNum, solvedNum) {
+  if (solvedNum === 0) {
+    return 0;
+  }
+  return Math.floor((attemptedNum - solvedNum) * 100 / attemptedNum);
+}
+
 dayjs__default.extend(duration__default);
 dayjs__default.extend(utc__default);
 dayjs__default.extend(timezone__default);
@@ -52,8 +59,9 @@ function getTimestamp(time) {
 }
 function getTimeDiff(seconds) {
   const two = (a) => {
-    if (a < 10)
-      return "0" + a;
+    if (a < 10) {
+      return `0${a}`;
+    }
     return String(a);
   };
   const h = Math.floor(seconds / 3600);
@@ -62,17 +70,113 @@ function getTimeDiff(seconds) {
   return [two(h), two(m), two(s)].join(":");
 }
 
+class ContestIndexConfig {
+  constructor() {
+    this.contestName = "";
+    this.startTime = createDayJS();
+    this.endTime = createDayJS();
+    this.freezeTime = createDayJS();
+    this.totalDurationTimestamp = 0;
+    this.freezeDurationTimestamp = 0;
+    this.unFreezeDurationTimestamp = 0;
+  }
+}
+class ContestIndex {
+  constructor() {
+    this.config = new ContestIndexConfig();
+    this.boardLink = "";
+  }
+}
+function createContestIndex(contestIndexJSON) {
+  const c = new ContestIndex();
+  const cc = c.config;
+  const cjc = contestIndexJSON.config;
+  cc.contestName = cjc.contest_name;
+  cc.startTime = createDayJS(cjc.start_time);
+  cc.endTime = createDayJS(cjc.end_time);
+  cc.totalDurationTimestamp = cc.endTime.unix() - cc.startTime.unix();
+  {
+    cc.freezeTime = cc.endTime;
+    cc.freezeDurationTimestamp = 0;
+    if (cjc.frozen_time !== void 0 && cjc.frozen_time != null) {
+      const frozenTime = Number(cjc.frozen_time);
+      cc.freezeTime = createDayJS(cc.endTime.unix() - frozenTime);
+      cc.freezeDurationTimestamp = frozenTime;
+    }
+    cc.unFreezeDurationTimestamp = cc.totalDurationTimestamp - cc.freezeDurationTimestamp;
+  }
+  cc.logo = cjc.logo;
+  c.boardLink = contestIndexJSON.board_link;
+  return c;
+}
+function createContestIndexList(contestListJSON) {
+  const contestIndexList = [];
+  const dfs = (contestList) => {
+    if (Object.prototype.hasOwnProperty.call(contestList, "config")) {
+      contestIndexList.push(createContestIndex(contestList));
+    } else {
+      for (const k in contestList) {
+        dfs(contestList[k]);
+      }
+    }
+  };
+  dfs(contestListJSON);
+  contestIndexList.sort((a, b) => {
+    if (a.config.startTime.isBefore(b.config.startTime)) {
+      return 1;
+    }
+    if (a.config.startTime.isAfter(b.config.startTime)) {
+      return -1;
+    }
+    if (a.config.endTime.isBefore(b.config.endTime)) {
+      return 1;
+    }
+    if (a.config.endTime.isAfter(b.config.endTime)) {
+      return -1;
+    }
+    if (a.config.contestName < b.config.contestName) {
+      return 1;
+    }
+    if (a.config.contestName > b.config.contestName) {
+      return -1;
+    }
+    return 0;
+  });
+  return contestIndexList;
+}
+
+class ProblemStatistics {
+  constructor() {
+    this.acceptedNum = 0;
+    this.rejectedNum = 0;
+    this.pendingNum = 0;
+    this.submittedNum = 0;
+    this.attemptedNum = 0;
+    this.ignoreNum = 0;
+    this.firstSolveSubmissions = [];
+    this.lastSolveSubmissions = [];
+  }
+  reset() {
+    this.acceptedNum = 0;
+    this.rejectedNum = 0;
+    this.pendingNum = 0;
+    this.submittedNum = 0;
+    this.firstSolveSubmissions = [];
+    this.lastSolveSubmissions = [];
+  }
+  get dict() {
+    if (this.acceptedNum === 0) {
+      return 0;
+    }
+    return calcDict(this.attemptedNum, this.acceptedNum);
+  }
+}
 class Problem {
   constructor() {
     this.id = "";
     this.label = "";
     this.name = "";
-    this.statistics = {
-      acceptedNum: 0,
-      rejectedNum: 0,
-      pendingNum: 0,
-      submittedNum: 0
-    };
+    this.statistics = new ProblemStatistics();
   }
 }
 function createProblem(problemJSON) {
@@ -273,6 +377,15 @@ function getImageSource(image) {
   return "";
 }
 
+class RankStatistics {
+  constructor() {
+    this.teamSolvedNum = [];
+  }
+  reset() {
+    this.teamSolvedNum = [];
+  }
+}
+
 class Team {
   constructor() {
     this.id = "";
@@ -281,20 +394,29 @@ class Team {
     this.group = [];
     this.tag = [];
     this.rank = 0;
+    this.organizationRank = -1;
     this.solvedProblemNum = 0;
+    this.attemptedProblemNum = 0;
     this.penalty = 0;
     this.problemStatistics = [];
     this.problemStatisticsMap = /* @__PURE__ */ new Map();
   }
-  penaltyToMinute() {
+  get penaltyToMinute() {
     return Math.floor(this.penalty / 60);
   }
+  get dict() {
+    const attemptedNum = this.attemptedProblemNum;
+    const solvedNum = this.solvedProblemNum;
+    return calcDict(attemptedNum, solvedNum);
+  }
   calcSolvedData() {
     this.solvedProblemNum = 0;
     this.penalty = 0;
+    this.attemptedProblemNum = 0;
     for (const p of this.problemStatistics) {
       if (p.isAccepted) {
         this.solvedProblemNum++;
+        this.attemptedProblemNum += p.failedCount + 1;
         this.penalty += p.penalty;
       }
     }
@@ -319,17 +441,18 @@ function createTeam(teamJSON) {
   t.id = teamJSON.id ?? teamJSON.team_id ?? "";
   t.name = teamJSON.name ?? teamJSON.team_name ?? "";
   t.organization = teamJSON.organization ?? "";
+  t.badge = teamJSON.badge;
   t.group = teamJSON.group ?? [];
   t.tag = teamJSON.group ?? [];
   t.coach = teamJSON.coach;
   t.members = teamJSON.members;
-  if (teamJSON.official === true) {
+  if (Boolean(teamJSON.official) === true) {
     t.group.push("official");
   }
-  if (teamJSON.unofficial === true) {
+  if (Boolean(teamJSON.unofficial) === true) {
     t.group.push("unofficial");
   }
-  if (teamJSON.girl === true) {
+  if (Boolean(teamJSON.girl) === true) {
     t.group.push("girl");
   }
   t.group = [...new Set(t.group)];
@@ -528,7 +651,7 @@ class Rank {
     this.teamsMap = new Map(this.teams.map((t) => [t.id, t]));
     this.submissions = ___default.cloneDeep(submissions).sort(Submission.compare);
     this.submissionsMap = new Map(this.submissions.map((s) => [s.id, s]));
-    this.firstSolvedSubmissions = new Map(this.contest.problems.map((p) => [p.id, []]));
+    this.rankStatistics = new RankStatistics();
   }
   buildRank(options) {
     (() => {
@@ -541,7 +664,9 @@ class Rank {
         });
         t.problemStatisticsMap = new Map(t.problemStatistics.map((ps) => [ps.problem.id, ps]));
       }
-      this.firstSolvedSubmissions = new Map(this.contest.problems.map((p) => [p.id, []]));
+      this.contest.problems.forEach((p) => {
+        p.statistics.reset();
+      });
       for (const s of this.submissions) {
         const teamId = s.teamId;
         const problemId = s.problemId;
@@ -557,13 +682,13 @@ class Rank {
         }
         const problemStatistics = team.problemStatisticsMap.get(problemId);
         const submissions = problemStatistics.submissions;
-        const firstSolvedSubmissions = this.firstSolvedSubmissions.get(problemId);
         submissions.push(s);
         problem.statistics.submittedNum++;
         if (problemStatistics.isSolved) {
           continue;
         }
         if (s.isIgnore || s.isNotCalculatedPenaltyStatus()) {
+          problem.statistics.ignoreNum++;
           problemStatistics.ignoreCount++;
           continue;
         }
@@ -574,10 +699,15 @@ class Rank {
           problemStatistics.isSolved = true;
           problemStatistics.solvedTimestamp = s.timestamp;
           problem.statistics.acceptedNum++;
-          if (firstSolvedSubmissions.length === 0 || firstSolvedSubmissions[firstSolvedSubmissions.length - 1].timestamp === s.timestamp) {
+          problem.statistics.attemptedNum += problemStatistics.failedCount + 1;
+          if (problem.statistics.firstSolveSubmissions.length === 0 || problem.statistics.firstSolveSubmissions[problem.statistics.firstSolveSubmissions.length - 1].timestamp === s.timestamp) {
             problemStatistics.isFirstSolved = true;
-            firstSolvedSubmissions.push(s);
+            problem.statistics.firstSolveSubmissions.push(s);
+          }
+          while (problem.statistics.lastSolveSubmissions.length > 0) {
+            problem.statistics.lastSolveSubmissions.pop();
           }
+          problem.statistics.lastSolveSubmissions.push(s);
         }
         if (s.isRejected()) {
           problemStatistics.failedCount++;
@@ -596,6 +726,24 @@ class Rank {
           t.rank = rank++;
         }
       }
+      if (this.contest.organization) {
+        let rank = 1;
+        const se = /* @__PURE__ */ new Set();
+        for (const t of this.teams) {
+          if (!se.has(t.organization)) {
+            se.add(t.organization);
+            t.organizationRank = rank;
+            rank++;
+          }
+        }
+      }
+    })();
+    (() => {
+      this.rankStatistics.reset();
+      this.rankStatistics.teamSolvedNum = Array(this.contest.problems.length + 1).fill(0);
+      for (const t of this.teams) {
+        this.rankStatistics.teamSolvedNum[t.solvedProblemNum]++;
+      }
     })();
     return this;
   }
@@ -691,13 +839,20 @@ class Resolver extends Rank {
 
 exports.dayjs = dayjs__default;
 exports.Contest = Contest;
+exports.ContestIndex = ContestIndex;
+exports.ContestIndexConfig = ContestIndexConfig;
 exports.Problem = Problem;
+exports.ProblemStatistics = ProblemStatistics;
 exports.Rank = Rank;
+exports.RankStatistics = RankStatistics;
 exports.Resolver = Resolver;
 exports.Submission = Submission;
 exports.Team = Team;
 exports.TeamProblemStatistics = TeamProblemStatistics;
+exports.calcDict = calcDict;
 exports.createContest = createContest;
+exports.createContestIndex = createContestIndex;
+exports.createContestIndexList = createContestIndexList;
 exports.createDayJS = createDayJS;
 exports.createProblem = createProblem;
 exports.createProblems = createProblems;

package/dist/index.d.ts

@@ -1,6 +1,28 @@
 import dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
-import { SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, StatusTimeDisplay, Image, ContestState, Contest as Contest$1, Team as Team$1, Teams as Teams$1 } from '@xcpcio/types';
+import { Image, ContestIndex as ContestIndex$1, SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, StatusTimeDisplay, ContestState, Contest as Contest$1, Team as Team$1, Teams as Teams$1 } from '@xcpcio/types';
+
+declare class ContestIndexConfig {
+    contestName: string;
+    startTime: dayjs.Dayjs;
+    endTime: dayjs.Dayjs;
+    freezeTime: dayjs.Dayjs;
+    totalDurationTimestamp: number;
+    freezeDurationTimestamp: number;
+    unFreezeDurationTimestamp: number;
+    logo?: Image;
+    constructor();
+}
+declare class ContestIndex {
+    config: ContestIndexConfig;
+    boardLink: string;
+    constructor();
+}
+type ContestIndexList = Array<ContestIndex>;
+declare function createContestIndex(contestIndexJSON: ContestIndex$1): ContestIndex;
+declare function createContestIndexList(contestListJSON: any): ContestIndexList;
+
+declare function calcDict(attemptedNum: number, solvedNum: number): number;
 
 declare function createDayJS(time?: Date | string | number | undefined): dayjs.Dayjs;
 declare function getTimestamp(time: number | dayjs.Dayjs): number;
@@ -24,11 +46,18 @@ type Submissions = Array<Submission>;
 declare function createSubmission(submissionJSON: Submission$1): Submission;
 declare function createSubmissions(submissionsJSON: Submissions$1): Submissions;
 
-interface ProblemStatistics {
+declare class ProblemStatistics {
     acceptedNum: number;
     rejectedNum: number;
     pendingNum: number;
     submittedNum: number;
+    attemptedNum: number;
+    ignoreNum: number;
+    firstSolveSubmissions: Submissions;
+    lastSolveSubmissions: Submissions;
+    constructor();
+    reset(): void;
+    get dict(): number;
 }
 declare class Problem {
     id: string;
@@ -100,21 +129,31 @@ declare function createContest(contestJSON: Contest$1): Contest;
 
 declare function getImageSource(image: Image): string;
 
+declare class RankStatistics {
+    teamSolvedNum: Array<number>;
+    constructor();
+    reset(): void;
+}
+
 declare class Team {
     id: string;
     name: string;
     organization: string;
+    badge?: Image;
     group: Array<string>;
     tag: Array<string>;
     coach?: string | Array<string>;
     members?: string | Array<string>;
     rank: number;
+    organizationRank: number;
     solvedProblemNum: number;
+    attemptedProblemNum: number;
     penalty: number;
     problemStatistics: Array<TeamProblemStatistics>;
     problemStatisticsMap: Map<string, TeamProblemStatistics>;
     constructor();
-    penaltyToMinute(): number;
+    get penaltyToMinute(): number;
+    get dict(): number;
     calcSolvedData(): void;
     static compare(lhs: Team, rhs: Team): number;
 }
@@ -128,7 +167,7 @@ declare class Rank {
     teamsMap: Map<string, Team>;
     submissions: Submissions;
     submissionsMap: Map<string, Submission>;
-    firstSolvedSubmissions: Map<string, Submissions>;
+    rankStatistics: RankStatistics;
     constructor(contest: Contest, teams: Teams, submissions: Submissions);
     buildRank(options?: {
         timestamp?: number;
@@ -159,4 +198,4 @@ declare function isRejected(status: SubmissionStatus): boolean;
 declare function isPending(status: SubmissionStatus): boolean;
 declare function isNotCalculatedPenaltyStatus(status: SubmissionStatus): boolean;
 
-export { Contest, Problem, ProblemStatistics, Problems, Rank, Resolver, Submission, Submissions, Team, TeamProblemStatistics, Teams, createContest, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, stringToSubmissionStatus };
+export { Contest, ContestIndex, ContestIndexConfig, ContestIndexList, Problem, ProblemStatistics, Problems, Rank, RankStatistics, Resolver, Submission, Submissions, Team, TeamProblemStatistics, Teams, calcDict, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, stringToSubmissionStatus };

package/dist/index.mjs

@@ -11,6 +11,13 @@ import relativeTime from 'dayjs/plugin/relativeTime';
 import { VERSION, ContestState, SubmissionStatus } from '@xcpcio/types';
 import _ from 'lodash';
 
+function calcDict(attemptedNum, solvedNum) {
+  if (solvedNum === 0) {
+    return 0;
+  }
+  return Math.floor((attemptedNum - solvedNum) * 100 / attemptedNum);
+}
+
 dayjs.extend(duration);
 dayjs.extend(utc);
 dayjs.extend(timezone);
@@ -36,8 +43,9 @@ function getTimestamp(time) {
 }
 function getTimeDiff(seconds) {
   const two = (a) => {
-    if (a < 10)
-      return "0" + a;
+    if (a < 10) {
+      return `0${a}`;
+    }
     return String(a);
   };
   const h = Math.floor(seconds / 3600);
@@ -46,17 +54,113 @@ function getTimeDiff(seconds) {
   return [two(h), two(m), two(s)].join(":");
 }
 
+class ContestIndexConfig {
+  constructor() {
+    this.contestName = "";
+    this.startTime = createDayJS();
+    this.endTime = createDayJS();
+    this.freezeTime = createDayJS();
+    this.totalDurationTimestamp = 0;
+    this.freezeDurationTimestamp = 0;
+    this.unFreezeDurationTimestamp = 0;
+  }
+}
+class ContestIndex {
+  constructor() {
+    this.config = new ContestIndexConfig();
+    this.boardLink = "";
+  }
+}
+function createContestIndex(contestIndexJSON) {
+  const c = new ContestIndex();
+  const cc = c.config;
+  const cjc = contestIndexJSON.config;
+  cc.contestName = cjc.contest_name;
+  cc.startTime = createDayJS(cjc.start_time);
+  cc.endTime = createDayJS(cjc.end_time);
+  cc.totalDurationTimestamp = cc.endTime.unix() - cc.startTime.unix();
+  {
+    cc.freezeTime = cc.endTime;
+    cc.freezeDurationTimestamp = 0;
+    if (cjc.frozen_time !== void 0 && cjc.frozen_time != null) {
+      const frozenTime = Number(cjc.frozen_time);
+      cc.freezeTime = createDayJS(cc.endTime.unix() - frozenTime);
+      cc.freezeDurationTimestamp = frozenTime;
+    }
+    cc.unFreezeDurationTimestamp = cc.totalDurationTimestamp - cc.freezeDurationTimestamp;
+  }
+  cc.logo = cjc.logo;
+  c.boardLink = contestIndexJSON.board_link;
+  return c;
+}
+function createContestIndexList(contestListJSON) {
+  const contestIndexList = [];
+  const dfs = (contestList) => {
+    if (Object.prototype.hasOwnProperty.call(contestList, "config")) {
+      contestIndexList.push(createContestIndex(contestList));
+    } else {
+      for (const k in contestList) {
+        dfs(contestList[k]);
+      }
+    }
+  };
+  dfs(contestListJSON);
+  contestIndexList.sort((a, b) => {
+    if (a.config.startTime.isBefore(b.config.startTime)) {
+      return 1;
+    }
+    if (a.config.startTime.isAfter(b.config.startTime)) {
+      return -1;
+    }
+    if (a.config.endTime.isBefore(b.config.endTime)) {
+      return 1;
+    }
+    if (a.config.endTime.isAfter(b.config.endTime)) {
+      return -1;
+    }
+    if (a.config.contestName < b.config.contestName) {
+      return 1;
+    }
+    if (a.config.contestName > b.config.contestName) {
+      return -1;
+    }
+    return 0;
+  });
+  return contestIndexList;
+}
+
+class ProblemStatistics {
+  constructor() {
+    this.acceptedNum = 0;
+    this.rejectedNum = 0;
+    this.pendingNum = 0;
+    this.submittedNum = 0;
+    this.attemptedNum = 0;
+    this.ignoreNum = 0;
+    this.firstSolveSubmissions = [];
+    this.lastSolveSubmissions = [];
+  }
+  reset() {
+    this.acceptedNum = 0;
+    this.rejectedNum = 0;
+    this.pendingNum = 0;
+    this.submittedNum = 0;
+    this.firstSolveSubmissions = [];
+    this.lastSolveSubmissions = [];
+  }
+  get dict() {
+    if (this.acceptedNum === 0) {
+      return 0;
+    }
+    return calcDict(this.attemptedNum, this.acceptedNum);
+  }
+}
 class Problem {
   constructor() {
     this.id = "";
     this.label = "";
     this.name = "";
-    this.statistics = {
-      acceptedNum: 0,
-      rejectedNum: 0,
-      pendingNum: 0,
-      submittedNum: 0
-    };
+    this.statistics = new ProblemStatistics();
   }
 }
 function createProblem(problemJSON) {
@@ -257,6 +361,15 @@ function getImageSource(image) {
   return "";
 }
 
+class RankStatistics {
+  constructor() {
+    this.teamSolvedNum = [];
+  }
+  reset() {
+    this.teamSolvedNum = [];
+  }
+}
+
 class Team {
   constructor() {
     this.id = "";
@@ -265,20 +378,29 @@ class Team {
     this.group = [];
     this.tag = [];
     this.rank = 0;
+    this.organizationRank = -1;
     this.solvedProblemNum = 0;
+    this.attemptedProblemNum = 0;
     this.penalty = 0;
     this.problemStatistics = [];
     this.problemStatisticsMap = /* @__PURE__ */ new Map();
   }
-  penaltyToMinute() {
+  get penaltyToMinute() {
     return Math.floor(this.penalty / 60);
   }
+  get dict() {
+    const attemptedNum = this.attemptedProblemNum;
+    const solvedNum = this.solvedProblemNum;
+    return calcDict(attemptedNum, solvedNum);
+  }
   calcSolvedData() {
     this.solvedProblemNum = 0;
     this.penalty = 0;
+    this.attemptedProblemNum = 0;
     for (const p of this.problemStatistics) {
       if (p.isAccepted) {
         this.solvedProblemNum++;
+        this.attemptedProblemNum += p.failedCount + 1;
         this.penalty += p.penalty;
       }
     }
@@ -303,17 +425,18 @@ function createTeam(teamJSON) {
   t.id = teamJSON.id ?? teamJSON.team_id ?? "";
   t.name = teamJSON.name ?? teamJSON.team_name ?? "";
   t.organization = teamJSON.organization ?? "";
+  t.badge = teamJSON.badge;
   t.group = teamJSON.group ?? [];
   t.tag = teamJSON.group ?? [];
   t.coach = teamJSON.coach;
   t.members = teamJSON.members;
-  if (teamJSON.official === true) {
+  if (Boolean(teamJSON.official) === true) {
     t.group.push("official");
   }
-  if (teamJSON.unofficial === true) {
+  if (Boolean(teamJSON.unofficial) === true) {
     t.group.push("unofficial");
   }
-  if (teamJSON.girl === true) {
+  if (Boolean(teamJSON.girl) === true) {
     t.group.push("girl");
   }
   t.group = [...new Set(t.group)];
@@ -512,7 +635,7 @@ class Rank {
     this.teamsMap = new Map(this.teams.map((t) => [t.id, t]));
     this.submissions = _.cloneDeep(submissions).sort(Submission.compare);
     this.submissionsMap = new Map(this.submissions.map((s) => [s.id, s]));
-    this.firstSolvedSubmissions = new Map(this.contest.problems.map((p) => [p.id, []]));
+    this.rankStatistics = new RankStatistics();
   }
   buildRank(options) {
     (() => {
@@ -525,7 +648,9 @@ class Rank {
         });
         t.problemStatisticsMap = new Map(t.problemStatistics.map((ps) => [ps.problem.id, ps]));
       }
-      this.firstSolvedSubmissions = new Map(this.contest.problems.map((p) => [p.id, []]));
+      this.contest.problems.forEach((p) => {
+        p.statistics.reset();
+      });
       for (const s of this.submissions) {
         const teamId = s.teamId;
         const problemId = s.problemId;
@@ -541,13 +666,13 @@ class Rank {
         }
         const problemStatistics = team.problemStatisticsMap.get(problemId);
         const submissions = problemStatistics.submissions;
-        const firstSolvedSubmissions = this.firstSolvedSubmissions.get(problemId);
         submissions.push(s);
         problem.statistics.submittedNum++;
         if (problemStatistics.isSolved) {
           continue;
         }
         if (s.isIgnore || s.isNotCalculatedPenaltyStatus()) {
+          problem.statistics.ignoreNum++;
           problemStatistics.ignoreCount++;
           continue;
         }
@@ -558,10 +683,15 @@ class Rank {
           problemStatistics.isSolved = true;
           problemStatistics.solvedTimestamp = s.timestamp;
           problem.statistics.acceptedNum++;
-          if (firstSolvedSubmissions.length === 0 || firstSolvedSubmissions[firstSolvedSubmissions.length - 1].timestamp === s.timestamp) {
+          problem.statistics.attemptedNum += problemStatistics.failedCount + 1;
+          if (problem.statistics.firstSolveSubmissions.length === 0 || problem.statistics.firstSolveSubmissions[problem.statistics.firstSolveSubmissions.length - 1].timestamp === s.timestamp) {
             problemStatistics.isFirstSolved = true;
-            firstSolvedSubmissions.push(s);
+            problem.statistics.firstSolveSubmissions.push(s);
+          }
+          while (problem.statistics.lastSolveSubmissions.length > 0) {
+            problem.statistics.lastSolveSubmissions.pop();
           }
+          problem.statistics.lastSolveSubmissions.push(s);
         }
         if (s.isRejected()) {
           problemStatistics.failedCount++;
@@ -580,6 +710,24 @@ class Rank {
           t.rank = rank++;
         }
       }
+      if (this.contest.organization) {
+        let rank = 1;
+        const se = /* @__PURE__ */ new Set();
+        for (const t of this.teams) {
+          if (!se.has(t.organization)) {
+            se.add(t.organization);
+            t.organizationRank = rank;
+            rank++;
+          }
+        }
+      }
+    })();
+    (() => {
+      this.rankStatistics.reset();
+      this.rankStatistics.teamSolvedNum = Array(this.contest.problems.length + 1).fill(0);
+      for (const t of this.teams) {
+        this.rankStatistics.teamSolvedNum[t.solvedProblemNum]++;
+      }
     })();
     return this;
   }
@@ -673,4 +821,4 @@ class Resolver extends Rank {
   }
 }
 
-export { Contest, Problem, Rank, Resolver, Submission, Team, TeamProblemStatistics, createContest, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, stringToSubmissionStatus };
+export { Contest, ContestIndex, ContestIndexConfig, Problem, ProblemStatistics, Rank, RankStatistics, Resolver, Submission, Team, TeamProblemStatistics, calcDict, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, stringToSubmissionStatus };