@xcpcio/core 0.5.3 → 0.6.1

package/dist/index.cjs

@@ -404,9 +404,11 @@ function getImageSource(image) {
 class RankStatistics {
   constructor() {
     this.teamSolvedNum = [];
+    this.maxSolvedProblems = 0;
   }
   reset() {
     this.teamSolvedNum = [];
+    this.maxSolvedProblems = 0;
   }
 }
 
@@ -425,6 +427,7 @@ class Team {
     this.group = [];
     this.tag = [];
     this.rank = 0;
+    this.originalRank = 0;
     this.organizationRank = -1;
     this.solvedProblemNum = 0;
     this.attemptedProblemNum = 0;
@@ -438,6 +441,7 @@ class Team {
   }
   reset() {
     this.rank = 0;
+    this.originalRank = 0;
     this.organizationRank = -1;
     this.solvedProblemNum = 0;
     this.attemptedProblemNum = 0;
@@ -726,6 +730,10 @@ class RankOptions {
     this.timestamp = 0;
     this.enableFilterTeamsByGroup = false;
     this.group = "";
+    this.filterOrganizations = [];
+    this.filterOrganizationMap = /* @__PURE__ */ new Map();
+    this.filterTeams = [];
+    this.filterTeamMap = /* @__PURE__ */ new Map();
   }
   setWidth(width, contest) {
     this.width = width;
@@ -745,6 +753,22 @@ class RankOptions {
   disableFilterTeamsByGroup() {
     this.enableFilterTeamsByGroup = false;
   }
+  setFilterOrganizations(filterOrganizations) {
+    const m = /* @__PURE__ */ new Map();
+    filterOrganizations.forEach((item) => {
+      m.set(item.value, item);
+    });
+    this.filterOrganizations = filterOrganizations;
+    this.filterOrganizationMap = m;
+  }
+  setFilterTeams(filterTeams) {
+    const m = /* @__PURE__ */ new Map();
+    filterTeams.forEach((item) => {
+      m.set(item.value, item);
+    });
+    this.filterTeams = filterTeams;
+    this.filterTeamMap = m;
+  }
 }
 class Rank {
   constructor(contest, teams, submissions) {
@@ -753,6 +777,9 @@ 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.organizations = this.buildOrganizations();
+    this.originTeams = this.teams.map((t) => t);
+    this.originTeams.sort(Team.compare);
     this.rankStatistics = new RankStatistics();
     this.options = new RankOptions();
   }
@@ -856,8 +883,11 @@ class Rank {
         }
         preSubmissionTimestampToMinute = s.timestampToMinute;
       }
-      this.teams.forEach((t) => t.postProcessPlaceChartPoints());
+      this.teams.forEach((t) => t.calcSolvedData());
+      this.teams.sort(Team.compare);
+      this.buildTeamRank();
       this.buildOrgRank();
+      this.teams.forEach((t) => t.postProcessPlaceChartPoints());
     })();
     (() => {
       this.rankStatistics.reset();
@@ -865,14 +895,19 @@ class Rank {
       for (const t of this.teams) {
         this.rankStatistics.teamSolvedNum[t.solvedProblemNum]++;
       }
+      if (this.teams.length > 0) {
+        this.rankStatistics.maxSolvedProblems = this.teams[0].solvedProblemNum;
+      }
     })();
     return this;
   }
   buildTeamRank() {
     let rank = 1;
+    let originalRank = 1;
     let preTeam = null;
     for (const t of this.teams) {
       t.rank = rank++;
+      t.originalRank = originalRank++;
       if (preTeam !== null) {
         if (t.isEqualRank(preTeam)) {
           t.rank = preTeam.rank;
@@ -903,6 +938,23 @@ class Rank {
       preTeam = t;
     }
   }
+  buildOrganizations() {
+    if (!this.contest.organization) {
+      return [];
+    }
+    const res = new Array();
+    const se = /* @__PURE__ */ new Set();
+    this.teams.forEach((t) => {
+      const org = t.organization;
+      if (se.has(org)) {
+        return;
+      }
+      res.push(org);
+      se.add(org);
+    });
+    res.sort();
+    return res;
+  }
   filterTeamByOrg(team) {
     const o = this.options;
     if (o.enableFilterTeamsByGroup) {

package/dist/index.d.ts

@@ -139,6 +139,7 @@ declare function getImageSource(image: Image): string;
 
 declare class RankStatistics {
     teamSolvedNum: Array<number>;
+    maxSolvedProblems: number;
     constructor();
     reset(): void;
 }
@@ -159,6 +160,7 @@ declare class Team {
     coach?: string | Array<string>;
     members?: string | Array<string>;
     rank: number;
+    originalRank: number;
     organizationRank: number;
     solvedProblemNum: number;
     attemptedProblemNum: number;
@@ -182,17 +184,27 @@ type Teams = Array<Team>;
 declare function createTeam(teamJSON: Team$1): Team;
 declare function createTeams(teamsJSON: Teams$1): Teams;
 
+interface SelectOptionItem {
+    value: string;
+    text: string;
+}
 declare class RankOptions {
     enableFilterSubmissionsByTimestamp: boolean;
     width: number;
     timestamp: number;
     enableFilterTeamsByGroup: boolean;
     group: string;
+    filterOrganizations: Array<SelectOptionItem>;
+    filterOrganizationMap: Map<string, SelectOptionItem>;
+    filterTeams: Array<SelectOptionItem>;
+    filterTeamMap: Map<string, SelectOptionItem>;
     constructor();
     setWidth(width: number, contest: Contest): void;
     disableFilterSubmissionByTimestamp(): void;
     setGroup(group: string): void;
     disableFilterTeamsByGroup(): void;
+    setFilterOrganizations(filterOrganizations: Array<SelectOptionItem>): void;
+    setFilterTeams(filterTeams: Array<SelectOptionItem>): void;
 }
 declare class Rank {
     readonly contest: Contest;
@@ -200,12 +212,15 @@ declare class Rank {
     teamsMap: Map<string, Team>;
     submissions: Submissions;
     submissionsMap: Map<string, Submission>;
+    organizations: Array<string>;
+    originTeams: Teams;
     rankStatistics: RankStatistics;
     options: RankOptions;
     constructor(contest: Contest, teams: Teams, submissions: Submissions);
     buildRank(): this;
     buildTeamRank(): void;
     buildOrgRank(): void;
+    buildOrganizations(): string[];
     filterTeamByOrg(team: Team): boolean;
     getSubmissions(): Submissions;
 }
@@ -234,4 +249,4 @@ declare function isRejected(status: SubmissionStatus): boolean;
 declare function isPending(status: SubmissionStatus): boolean;
 declare function isNotCalculatedPenaltyStatus(status: SubmissionStatus): boolean;
 
-export { Contest, ContestIndex, ContestIndexConfig, ContestIndexList, PlaceChartPointData, Problem, ProblemStatistics, Problems, Rank, RankOptions, 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 };
+export { Contest, ContestIndex, ContestIndexConfig, ContestIndexList, PlaceChartPointData, Problem, ProblemStatistics, Problems, Rank, RankOptions, RankStatistics, Resolver, SelectOptionItem, 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

@@ -388,9 +388,11 @@ function getImageSource(image) {
 class RankStatistics {
   constructor() {
     this.teamSolvedNum = [];
+    this.maxSolvedProblems = 0;
   }
   reset() {
     this.teamSolvedNum = [];
+    this.maxSolvedProblems = 0;
   }
 }
 
@@ -409,6 +411,7 @@ class Team {
     this.group = [];
     this.tag = [];
     this.rank = 0;
+    this.originalRank = 0;
     this.organizationRank = -1;
     this.solvedProblemNum = 0;
     this.attemptedProblemNum = 0;
@@ -422,6 +425,7 @@ class Team {
   }
   reset() {
     this.rank = 0;
+    this.originalRank = 0;
     this.organizationRank = -1;
     this.solvedProblemNum = 0;
     this.attemptedProblemNum = 0;
@@ -710,6 +714,10 @@ class RankOptions {
     this.timestamp = 0;
     this.enableFilterTeamsByGroup = false;
     this.group = "";
+    this.filterOrganizations = [];
+    this.filterOrganizationMap = /* @__PURE__ */ new Map();
+    this.filterTeams = [];
+    this.filterTeamMap = /* @__PURE__ */ new Map();
   }
   setWidth(width, contest) {
     this.width = width;
@@ -729,6 +737,22 @@ class RankOptions {
   disableFilterTeamsByGroup() {
     this.enableFilterTeamsByGroup = false;
   }
+  setFilterOrganizations(filterOrganizations) {
+    const m = /* @__PURE__ */ new Map();
+    filterOrganizations.forEach((item) => {
+      m.set(item.value, item);
+    });
+    this.filterOrganizations = filterOrganizations;
+    this.filterOrganizationMap = m;
+  }
+  setFilterTeams(filterTeams) {
+    const m = /* @__PURE__ */ new Map();
+    filterTeams.forEach((item) => {
+      m.set(item.value, item);
+    });
+    this.filterTeams = filterTeams;
+    this.filterTeamMap = m;
+  }
 }
 class Rank {
   constructor(contest, teams, submissions) {
@@ -737,6 +761,9 @@ 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.organizations = this.buildOrganizations();
+    this.originTeams = this.teams.map((t) => t);
+    this.originTeams.sort(Team.compare);
     this.rankStatistics = new RankStatistics();
     this.options = new RankOptions();
   }
@@ -840,8 +867,11 @@ class Rank {
         }
         preSubmissionTimestampToMinute = s.timestampToMinute;
       }
-      this.teams.forEach((t) => t.postProcessPlaceChartPoints());
+      this.teams.forEach((t) => t.calcSolvedData());
+      this.teams.sort(Team.compare);
+      this.buildTeamRank();
       this.buildOrgRank();
+      this.teams.forEach((t) => t.postProcessPlaceChartPoints());
     })();
     (() => {
       this.rankStatistics.reset();
@@ -849,14 +879,19 @@ class Rank {
       for (const t of this.teams) {
         this.rankStatistics.teamSolvedNum[t.solvedProblemNum]++;
       }
+      if (this.teams.length > 0) {
+        this.rankStatistics.maxSolvedProblems = this.teams[0].solvedProblemNum;
+      }
     })();
     return this;
   }
   buildTeamRank() {
     let rank = 1;
+    let originalRank = 1;
     let preTeam = null;
     for (const t of this.teams) {
       t.rank = rank++;
+      t.originalRank = originalRank++;
       if (preTeam !== null) {
         if (t.isEqualRank(preTeam)) {
           t.rank = preTeam.rank;
@@ -887,6 +922,23 @@ class Rank {
       preTeam = t;
     }
   }
+  buildOrganizations() {
+    if (!this.contest.organization) {
+      return [];
+    }
+    const res = new Array();
+    const se = /* @__PURE__ */ new Set();
+    this.teams.forEach((t) => {
+      const org = t.organization;
+      if (se.has(org)) {
+        return;
+      }
+      res.push(org);
+      se.add(org);
+    });
+    res.sort();
+    return res;
+  }
   filterTeamByOrg(team) {
     const o = this.options;
     if (o.enableFilterTeamsByGroup) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xcpcio/core",
-  "version": "0.5.3",
+  "version": "0.6.1",
   "description": "XCPCIO Core",
   "author": "Dup4 <lyuzhi.pan@gmail.com>",
   "license": "MIT",
@@ -42,7 +42,7 @@
   "dependencies": {
     "dayjs": "^1.11.8",
     "lodash": "^4.17.21",
-    "@xcpcio/types": "0.5.3"
+    "@xcpcio/types": "0.6.1"
   },
   "devDependencies": {
     "@babel/types": "^7.22.4",

package/src/rank-statistics.ts

@@ -1,11 +1,14 @@
 export class RankStatistics {
   teamSolvedNum: Array<number>;
+  maxSolvedProblems: number;
 
   constructor() {
     this.teamSolvedNum = [];
+    this.maxSolvedProblems = 0;
   }
 
   reset() {
     this.teamSolvedNum = [];
+    this.maxSolvedProblems = 0;
   }
 }

package/src/rank.ts

@@ -8,6 +8,11 @@ import { Submission } from "./submission";
 import { TeamProblemStatistics } from "./problem";
 import { RankStatistics } from "./rank-statistics";
 
+export interface SelectOptionItem {
+  value: string;
+  text: string;
+}
+
 export class RankOptions {
   enableFilterSubmissionsByTimestamp: boolean;
   width: number;
@@ -16,6 +21,11 @@ export class RankOptions {
   enableFilterTeamsByGroup: boolean;
   group: string;
 
+  filterOrganizations: Array<SelectOptionItem>;
+  filterOrganizationMap: Map<string, SelectOptionItem>;
+  filterTeams: Array<SelectOptionItem>;
+  filterTeamMap: Map<string, SelectOptionItem>;
+
   constructor() {
     this.enableFilterSubmissionsByTimestamp = false;
     this.width = 0;
@@ -23,6 +33,12 @@ export class RankOptions {
 
     this.enableFilterTeamsByGroup = false;
     this.group = "";
+
+    this.filterOrganizations = [];
+    this.filterOrganizationMap = new Map<string, SelectOptionItem>();
+
+    this.filterTeams = [];
+    this.filterTeamMap = new Map<string, SelectOptionItem>();
   }
 
   setWidth(width: number, contest: Contest) {
@@ -47,6 +63,26 @@ export class RankOptions {
   disableFilterTeamsByGroup() {
     this.enableFilterTeamsByGroup = false;
   }
+
+  setFilterOrganizations(filterOrganizations: Array<SelectOptionItem>) {
+    const m = new Map<string, SelectOptionItem>();
+    filterOrganizations.forEach((item) => {
+      m.set(item.value, item);
+    });
+
+    this.filterOrganizations = filterOrganizations;
+    this.filterOrganizationMap = m;
+  }
+
+  setFilterTeams(filterTeams: Array<SelectOptionItem>) {
+    const m = new Map<string, SelectOptionItem>();
+    filterTeams.forEach((item) => {
+      m.set(item.value, item);
+    });
+
+    this.filterTeams = filterTeams;
+    this.filterTeamMap = m;
+  }
 }
 
 export class Rank {
@@ -58,6 +94,9 @@ export class Rank {
   submissions: Submissions;
   submissionsMap: Map<string, Submission>;
 
+  organizations: Array<string>;
+  originTeams: Teams;
+
   rankStatistics: RankStatistics;
 
   options: RankOptions;
@@ -71,6 +110,10 @@ export class Rank {
     this.submissions = _.cloneDeep(submissions).sort(Submission.compare);
     this.submissionsMap = new Map(this.submissions.map(s => [s.id, s]));
 
+    this.organizations = this.buildOrganizations();
+    this.originTeams = this.teams.map(t => t);
+    this.originTeams.sort(Team.compare);
+
     this.rankStatistics = new RankStatistics();
 
     this.options = new RankOptions();
@@ -208,8 +251,12 @@ export class Rank {
         preSubmissionTimestampToMinute = s.timestampToMinute;
       }
 
-      this.teams.forEach(t => t.postProcessPlaceChartPoints());
+      this.teams.forEach(t => t.calcSolvedData());
+      this.teams.sort(Team.compare);
+      this.buildTeamRank();
       this.buildOrgRank();
+
+      this.teams.forEach(t => t.postProcessPlaceChartPoints());
     })();
 
     (() => {
@@ -219,6 +266,10 @@ export class Rank {
       for (const t of this.teams) {
         this.rankStatistics.teamSolvedNum[t.solvedProblemNum]++;
       }
+
+      if (this.teams.length > 0) {
+        this.rankStatistics.maxSolvedProblems = this.teams[0].solvedProblemNum;
+      }
     })();
 
     return this;
@@ -226,9 +277,11 @@ export class Rank {
 
   buildTeamRank() {
     let rank = 1;
+    let originalRank = 1;
     let preTeam = null;
     for (const t of this.teams) {
       t.rank = rank++;
+      t.originalRank = originalRank++;
 
       if (preTeam !== null) {
         if (t.isEqualRank(preTeam)) {
@@ -269,6 +322,29 @@ export class Rank {
     }
   }
 
+  buildOrganizations() {
+    if (!this.contest.organization) {
+      return [];
+    }
+
+    const res = new Array<string>();
+    const se = new Set<string>();
+
+    this.teams.forEach((t) => {
+      const org = t.organization;
+      if (se.has(org)) {
+        return;
+      }
+
+      res.push(org);
+      se.add(org);
+    });
+
+    res.sort();
+
+    return res;
+  }
+
   filterTeamByOrg(team: Team) {
     const o = this.options;
 

package/src/team.ts

@@ -30,6 +30,7 @@ export class Team {
   members?: string | Array<string>;
 
   rank: number;
+  originalRank: number;
   organizationRank: number;
 
   solvedProblemNum: number;
@@ -57,6 +58,7 @@ export class Team {
     this.tag = [];
 
     this.rank = 0;
+    this.originalRank = 0;
     this.organizationRank = -1;
 
     this.solvedProblemNum = 0;
@@ -77,6 +79,7 @@ export class Team {
 
   reset() {
     this.rank = 0;
+    this.originalRank = 0;
     this.organizationRank = -1;
 
     this.solvedProblemNum = 0;