@xcpcio/core 0.23.0 → 0.24.3

package/dist/index.mjs

@@ -527,17 +527,251 @@ class TeamProblemStatistics {
   get isUnSubmitted() {
     return this.totalCount === 0;
   }
+  get solvedTimestampToMinute() {
+    return Math.floor(this.solvedTimestamp / 60);
+  }
   get penalty() {
     if (this.isSolved === false) {
       return 0;
     }
-    return Math.floor(this.solvedTimestamp / 60) * 60 + this.failedCount * this.contestPenalty;
+    return this.solvedTimestampToMinute * 60 + this.failedCount * this.contestPenalty;
   }
   get penaltyToMinute() {
     return Math.floor(this.penalty / 60);
   }
-  get solvedTimestampToMinute() {
-    return Math.floor(this.solvedTimestamp / 60);
+}
+
+class PlaceChartPointData {
+  constructor() {
+    this.timePoint = 0;
+    this.rank = 0;
+    this.lastSolvedProblem = null;
+  }
+}
+class Team {
+  constructor() {
+    this.id = "";
+    this.name = "";
+    this.organization = "";
+    this.group = [];
+    this.tag = [];
+    this.rank = 0;
+    this.originalRank = 0;
+    this.organizationRank = -1;
+    this.solvedProblemNum = 0;
+    this.attemptedProblemNum = 0;
+    this.lastSolvedProblem = null;
+    this.lastSolvedProblemTimestamp = 0;
+    this.penalty = 0;
+    this.problemStatistics = [];
+    this.problemStatisticsMap = /* @__PURE__ */ new Map();
+    this.submissions = [];
+    this.placeChartPoints = [];
+    this.awards = [];
+  }
+  reset() {
+    this.rank = 0;
+    this.originalRank = 0;
+    this.organizationRank = -1;
+    this.solvedProblemNum = 0;
+    this.attemptedProblemNum = 0;
+    this.lastSolvedProblem = null;
+    this.lastSolvedProblemTimestamp = 0;
+    this.penalty = 0;
+    this.problemStatistics = [];
+    this.problemStatisticsMap = /* @__PURE__ */ new Map();
+    this.submissions = [];
+    this.placeChartPoints = [];
+    this.awards = [];
+  }
+  get penaltyToMinute() {
+    return Math.floor(this.penalty / 60);
+  }
+  get dirt() {
+    const attemptedNum = this.attemptedProblemNum;
+    const solvedNum = this.solvedProblemNum;
+    return calcDirt(attemptedNum, solvedNum);
+  }
+  get membersToString() {
+    if (typeof this.members === "string") {
+      return this.members;
+    }
+    return this.members?.join(", ");
+  }
+  calcSolvedData() {
+    this.solvedProblemNum = 0;
+    this.attemptedProblemNum = 0;
+    this.penalty = 0;
+    for (const p of this.problemStatistics) {
+      if (p.isAccepted) {
+        this.solvedProblemNum++;
+        this.attemptedProblemNum += p.failedCount + 1;
+        this.penalty += p.penalty;
+      }
+    }
+  }
+  calcAwards(awards) {
+    if (!awards) {
+      return;
+    }
+    for (const award of awards) {
+      if (this.rank >= award.minRank && this.rank <= award.maxRank) {
+        this.awards.push(award.medalType);
+      }
+    }
+  }
+  isEqualRank(otherTeam) {
+    return this.solvedProblemNum === otherTeam.solvedProblemNum && this.penalty === otherTeam.penalty;
+  }
+  postProcessPlaceChartPoints() {
+    if (this.placeChartPoints.length === 0) {
+      return;
+    }
+    const res = [];
+    res.push(this.placeChartPoints[0]);
+    for (let i = 1; i < this.placeChartPoints.length - 1; i++) {
+      const p = this.placeChartPoints[i];
+      const preP = res[res.length - 1];
+      if (p.rank !== preP.rank || p.lastSolvedProblem !== preP.lastSolvedProblem) {
+        res.push(p);
+      }
+    }
+    if (this.placeChartPoints.length > 1) {
+      res.push(this.placeChartPoints[this.placeChartPoints.length - 1]);
+    }
+    this.placeChartPoints = res;
+  }
+  static compare(lhs, rhs) {
+    if (lhs.solvedProblemNum !== rhs.solvedProblemNum) {
+      return rhs.solvedProblemNum - lhs.solvedProblemNum;
+    }
+    if (lhs.penalty !== rhs.penalty) {
+      return lhs.penalty - rhs.penalty;
+    }
+    if (lhs.lastSolvedProblemTimestamp !== rhs.lastSolvedProblemTimestamp) {
+      return lhs.lastSolvedProblemTimestamp - rhs.lastSolvedProblemTimestamp;
+    }
+    if (lhs.name < rhs.name) {
+      return -1;
+    } else if (lhs.name > rhs.name) {
+      return 1;
+    }
+    return 0;
+  }
+}
+function createTeam(teamJSON) {
+  const t = new Team();
+  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 (Boolean(teamJSON.official) === true) {
+    t.group.push("official");
+  }
+  if (Boolean(teamJSON.unofficial) === true) {
+    t.group.push("unofficial");
+  }
+  if (Boolean(teamJSON.girl) === true) {
+    t.group.push("girl");
+  }
+  {
+    const tt = teamJSON;
+    for (const key of Object.keys(tt)) {
+      if (tt[key] === 1 || tt[key] === true) {
+        t.group.push(key);
+      }
+    }
+  }
+  t.group = [...new Set(t.group)];
+  t.group.sort();
+  if (teamJSON.location) {
+    t.location = teamJSON.location;
+  }
+  return t;
+}
+function createTeams(teamsJSON) {
+  if (Array.isArray(teamsJSON)) {
+    return teamsJSON.map((t) => createTeam(t));
+  } else {
+    const teams = Object.entries(teamsJSON).map(
+      ([teamId, team]) => createTeam({ ...team, team_id: team.team_id ?? teamId })
+    );
+    return teams;
+  }
+}
+
+class Submission {
+  constructor() {
+    this.status = SubmissionStatus.UNKNOWN;
+    this.isIgnore = false;
+    this.id = "";
+    this.teamId = "";
+    this.problemId = "";
+    this.timestamp = 0;
+  }
+  isAccepted() {
+    return isAccepted(this.status);
+  }
+  isRejected() {
+    return isRejected(this.status);
+  }
+  isPending() {
+    return isPending(this.status);
+  }
+  isNotCalculatedPenaltyStatus() {
+    return isNotCalculatedPenaltyStatus(this.status);
+  }
+  get timestampToMinute() {
+    return Math.floor(this.timestamp / 60);
+  }
+  static compare(lhs, rhs) {
+    if (lhs.timestamp !== rhs.timestamp) {
+      return lhs.timestamp - rhs.timestamp;
+    }
+    if (lhs.teamId === rhs.teamId) {
+      if (lhs.isAccepted() && !rhs.isAccepted()) {
+        return -1;
+      }
+      if (!lhs.isAccepted() && rhs.isAccepted()) {
+        return 1;
+      }
+    }
+    return 0;
+  }
+}
+function createSubmission(submissionJSON) {
+  const s = new Submission();
+  s.id = String(submissionJSON.id ?? submissionJSON.submission_id ?? "");
+  s.teamId = String(submissionJSON.team_id);
+  s.problemId = String(submissionJSON.problem_id);
+  s.timestamp = submissionJSON.timestamp;
+  s.status = stringToSubmissionStatus(submissionJSON.status);
+  s.isIgnore = submissionJSON.is_ignore ?? false;
+  return s;
+}
+function createSubmissions(submissionsJSON) {
+  if (Array.isArray(submissionsJSON)) {
+    return submissionsJSON.map((s, index) => createSubmission({ ...s, id: s.submission_id ?? String(index) }));
+  } else {
+    const submissions = Object.entries(submissionsJSON).map(
+      ([submissionId, s]) => createSubmission({ ...s, id: s.submission_id ?? submissionId })
+    );
+    return submissions;
+  }
+}
+
+class Balloon {
+  constructor() {
+    this.problem = new Problem();
+    this.team = new Team();
+    this.submission = new Submission();
+  }
+  get key() {
+    return `balloon-${this.team.id}-${this.problem.id}`;
   }
 }
 
@@ -810,234 +1044,16 @@ function getImageSource(image) {
 class RankStatistics {
   constructor() {
     this.teamSolvedNum = [];
+    this.teamSolvedNumIndex = [];
     this.maxSolvedProblems = 0;
   }
   reset() {
     this.teamSolvedNum = [];
+    this.teamSolvedNumIndex = [];
     this.maxSolvedProblems = 0;
   }
-}
-
-class PlaceChartPointData {
-  constructor() {
-    this.timePoint = 0;
-    this.rank = 0;
-    this.lastSolvedProblem = null;
-  }
-}
-class Team {
-  constructor() {
-    this.id = "";
-    this.name = "";
-    this.organization = "";
-    this.group = [];
-    this.tag = [];
-    this.rank = 0;
-    this.originalRank = 0;
-    this.organizationRank = -1;
-    this.solvedProblemNum = 0;
-    this.attemptedProblemNum = 0;
-    this.lastSolvedProblem = null;
-    this.lastSolvedProblemTimestamp = 0;
-    this.penalty = 0;
-    this.problemStatistics = [];
-    this.problemStatisticsMap = /* @__PURE__ */ new Map();
-    this.submissions = [];
-    this.placeChartPoints = [];
-    this.awards = [];
-  }
-  reset() {
-    this.rank = 0;
-    this.originalRank = 0;
-    this.organizationRank = -1;
-    this.solvedProblemNum = 0;
-    this.attemptedProblemNum = 0;
-    this.lastSolvedProblem = null;
-    this.lastSolvedProblemTimestamp = 0;
-    this.penalty = 0;
-    this.problemStatistics = [];
-    this.problemStatisticsMap = /* @__PURE__ */ new Map();
-    this.submissions = [];
-    this.placeChartPoints = [];
-    this.awards = [];
-  }
-  get penaltyToMinute() {
-    return Math.floor(this.penalty / 60);
-  }
-  get dirt() {
-    const attemptedNum = this.attemptedProblemNum;
-    const solvedNum = this.solvedProblemNum;
-    return calcDirt(attemptedNum, solvedNum);
-  }
-  get membersToString() {
-    if (typeof this.members === "string") {
-      return this.members;
-    }
-    return this.members?.join(", ");
-  }
-  calcSolvedData() {
-    this.solvedProblemNum = 0;
-    this.attemptedProblemNum = 0;
-    this.penalty = 0;
-    for (const p of this.problemStatistics) {
-      if (p.isAccepted) {
-        this.solvedProblemNum++;
-        this.attemptedProblemNum += p.failedCount + 1;
-        this.penalty += p.penalty;
-      }
-    }
-  }
-  calcAwards(awards) {
-    if (!awards) {
-      return;
-    }
-    for (const award of awards) {
-      if (this.rank >= award.minRank && this.rank <= award.maxRank) {
-        this.awards.push(award.medalType);
-      }
-    }
-  }
-  isEqualRank(otherTeam) {
-    return this.solvedProblemNum === otherTeam.solvedProblemNum && this.penalty === otherTeam.penalty;
-  }
-  postProcessPlaceChartPoints() {
-    if (this.placeChartPoints.length === 0) {
-      return;
-    }
-    const res = [];
-    res.push(this.placeChartPoints[0]);
-    for (let i = 1; i < this.placeChartPoints.length - 1; i++) {
-      const p = this.placeChartPoints[i];
-      const preP = res[res.length - 1];
-      if (p.rank !== preP.rank || p.lastSolvedProblem !== preP.lastSolvedProblem) {
-        res.push(p);
-      }
-    }
-    if (this.placeChartPoints.length > 1) {
-      res.push(this.placeChartPoints[this.placeChartPoints.length - 1]);
-    }
-    this.placeChartPoints = res;
-  }
-  static compare(lhs, rhs) {
-    if (lhs.solvedProblemNum !== rhs.solvedProblemNum) {
-      return rhs.solvedProblemNum - lhs.solvedProblemNum;
-    }
-    if (lhs.penalty !== rhs.penalty) {
-      return lhs.penalty - rhs.penalty;
-    }
-    if (lhs.lastSolvedProblemTimestamp !== rhs.lastSolvedProblemTimestamp) {
-      return lhs.lastSolvedProblemTimestamp - rhs.lastSolvedProblemTimestamp;
-    }
-    if (lhs.name < rhs.name) {
-      return -1;
-    } else if (lhs.name > rhs.name) {
-      return 1;
-    }
-    return 0;
-  }
-}
-function createTeam(teamJSON) {
-  const t = new Team();
-  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 (Boolean(teamJSON.official) === true) {
-    t.group.push("official");
-  }
-  if (Boolean(teamJSON.unofficial) === true) {
-    t.group.push("unofficial");
-  }
-  if (Boolean(teamJSON.girl) === true) {
-    t.group.push("girl");
-  }
-  {
-    const tt = teamJSON;
-    for (const key of Object.keys(tt)) {
-      if (tt[key] === 1 || tt[key] === true) {
-        t.group.push(key);
-      }
-    }
-  }
-  t.group = [...new Set(t.group)];
-  t.group.sort();
-  if (teamJSON.location) {
-    t.location = teamJSON.location;
-  }
-  return t;
-}
-function createTeams(teamsJSON) {
-  if (Array.isArray(teamsJSON)) {
-    return teamsJSON.map((t) => createTeam(t));
-  } else {
-    const teams = Object.entries(teamsJSON).map(
-      ([teamId, team]) => createTeam({ ...team, team_id: team.team_id ?? teamId })
-    );
-    return teams;
-  }
-}
-
-class Submission {
-  constructor() {
-    this.status = SubmissionStatus.UNKNOWN;
-    this.isIgnore = false;
-    this.id = "";
-    this.teamId = "";
-    this.problemId = "";
-    this.timestamp = 0;
-  }
-  isAccepted() {
-    return isAccepted(this.status);
-  }
-  isRejected() {
-    return isRejected(this.status);
-  }
-  isPending() {
-    return isPending(this.status);
-  }
-  isNotCalculatedPenaltyStatus() {
-    return isNotCalculatedPenaltyStatus(this.status);
-  }
-  get timestampToMinute() {
-    return Math.floor(this.timestamp / 60);
-  }
-  static compare(lhs, rhs) {
-    if (lhs.timestamp !== rhs.timestamp) {
-      return lhs.timestamp - rhs.timestamp;
-    }
-    if (lhs.teamId === rhs.teamId) {
-      if (lhs.isAccepted() && !rhs.isAccepted()) {
-        return -1;
-      }
-      if (!lhs.isAccepted() && rhs.isAccepted()) {
-        return 1;
-      }
-    }
-    return 0;
-  }
-}
-function createSubmission(submissionJSON) {
-  const s = new Submission();
-  s.id = String(submissionJSON.id ?? submissionJSON.submission_id ?? "");
-  s.teamId = String(submissionJSON.team_id);
-  s.problemId = String(submissionJSON.problem_id);
-  s.timestamp = submissionJSON.timestamp;
-  s.status = stringToSubmissionStatus(submissionJSON.status);
-  s.isIgnore = submissionJSON.is_ignore ?? false;
-  return s;
-}
-function createSubmissions(submissionsJSON) {
-  if (Array.isArray(submissionsJSON)) {
-    return submissionsJSON.map((s, index) => createSubmission({ ...s, id: s.submission_id ?? String(index) }));
-  } else {
-    const submissions = Object.entries(submissionsJSON).map(
-      ([submissionId, s]) => createSubmission({ ...s, id: s.submission_id ?? submissionId })
-    );
-    return submissions;
+  getTeamSolvedNumIndex(solvedNum) {
+    return this.teamSolvedNumIndex[solvedNum] ?? 0;
   }
 }
 
@@ -1119,31 +1135,35 @@ class Rank {
     this.originTeams.sort(Team.compare);
     this.rankStatistics = new RankStatistics();
     this.options = new RankOptions();
+    this.balloons = [];
   }
-  buildRank() {
+  cleanRank() {
     (() => {
-      (() => {
-        this.teams = [];
-        for (const [_k, v] of this.teamsMap) {
-          if (this.filterTeamByOrg(v)) {
-            continue;
-          }
-          this.teams.push(v);
+      this.teams = [];
+      for (const [_k, v] of this.teamsMap) {
+        if (this.filterTeamByOrg(v)) {
+          continue;
         }
-      })();
-      for (const t of this.teams) {
-        t.reset();
-        t.problemStatistics = this.contest.problems.map((p) => {
-          const ps = new TeamProblemStatistics();
-          ps.problem = p;
-          ps.contestPenalty = this.contest.penalty;
-          return ps;
-        });
-        t.problemStatisticsMap = new Map(t.problemStatistics.map((ps) => [ps.problem.id, ps]));
+        this.teams.push(v);
       }
-      this.contest.problems.forEach((p) => {
-        p.statistics.reset();
+    })();
+    for (const t of this.teams) {
+      t.reset();
+      t.problemStatistics = this.contest.problems.map((p) => {
+        const ps = new TeamProblemStatistics();
+        ps.problem = p;
+        ps.contestPenalty = this.contest.penalty;
+        return ps;
       });
+      t.problemStatisticsMap = new Map(t.problemStatistics.map((ps) => [ps.problem.id, ps]));
+    }
+    this.contest.problems.forEach((p) => {
+      p.statistics.reset();
+    });
+  }
+  buildRank() {
+    (() => {
+      this.cleanRank();
       this.teams.forEach(
         (t) => t.placeChartPoints.push({
           timePoint: 0,
@@ -1154,6 +1174,7 @@ class Rank {
       (() => {
         this.rankStatistics.reset();
         this.rankStatistics.teamSolvedNum = Array(this.contest.problems.length + 1).fill(0);
+        this.rankStatistics.teamSolvedNumIndex = Array(this.contest.problems.length + 1).fill(0);
       })();
       let preSubmissionTimestampToMinute = 0;
       const allSubmissions = this.getSubmissions();
@@ -1235,6 +1256,15 @@ class Rank {
       for (const t of this.teams) {
         this.rankStatistics.teamSolvedNum[t.solvedProblemNum]++;
       }
+      {
+        let current = 0;
+        const teamSolvedNum = this.rankStatistics.teamSolvedNum;
+        const teamSolvedNumIndex = this.rankStatistics.teamSolvedNumIndex;
+        for (let i = teamSolvedNumIndex.length - 1; i >= 0; i--) {
+          current += teamSolvedNum[i] > 0 ? 1 : 0;
+          teamSolvedNumIndex[i] = current;
+        }
+      }
       if (this.teams.length > 0) {
         this.rankStatistics.maxSolvedProblems = this.teams[0].solvedProblemNum;
       }
@@ -1312,6 +1342,36 @@ class Rank {
       (s) => s.timestamp <= this.options.timestamp
     ).sort(Submission.compare);
   }
+  buildBalloons() {
+    this.balloons = [];
+    this.cleanRank();
+    const allSubmissions = this.getSubmissions();
+    for (let ix = 0; ix < allSubmissions.length; ix++) {
+      const s = allSubmissions[ix];
+      const teamId = s.teamId;
+      const problemId = s.problemId;
+      const team = this.teamsMap.get(teamId);
+      const problem = this.contest.problemsMap.get(problemId);
+      (() => {
+        if (team === void 0 || problem === void 0) {
+          return;
+        }
+        const problemStatistics = team.problemStatisticsMap.get(problemId);
+        if (problemStatistics.isSolved) {
+          return;
+        }
+        if (s.isAccepted()) {
+          problemStatistics.isSolved = true;
+          problemStatistics.solvedTimestamp = s.timestamp;
+          const b = new Balloon();
+          b.team = team;
+          b.problem = problem;
+          b.submission = s;
+          this.balloons.push(b);
+        }
+      })();
+    }
+  }
 }
 
 class ResolverOperation {
@@ -1402,4 +1462,4 @@ class Resolver extends Rank {
   }
 }
 
-export { Award, 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, 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.23.0",
+  "version": "0.24.3",
   "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.23.0"
+    "@xcpcio/types": "0.24.3"
   },
   "devDependencies": {
     "@babel/types": "^7.22.4",

package/src/balloon.ts

@@ -0,0 +1,21 @@
+import { Problem } from "./problem";
+import { Team } from "./team";
+import { Submission } from "./submission";
+
+export class Balloon {
+  problem: Problem;
+  team: Team;
+  submission: Submission;
+
+  constructor() {
+    this.problem = new Problem();
+    this.team = new Team();
+    this.submission = new Submission();
+  }
+
+  get key() {
+    return `balloon-${this.team.id}-${this.problem.id}`;
+  }
+}
+
+export type Balloons = Array<Balloon>;

package/src/index.ts

@@ -1,7 +1,9 @@
 export * from "./export";
+export * from "./utils";
+
 export * from "./award";
+export * from "./balloon";
 export * from "./contest-index";
-export * from "./utils";
 export * from "./contest";
 export * from "./image";
 export * from "./problem";

package/src/problem.ts

@@ -182,19 +182,19 @@ export class TeamProblemStatistics {
     return this.totalCount === 0;
   }
 
+  get solvedTimestampToMinute() {
+    return Math.floor(this.solvedTimestamp / 60);
+  }
+
   get penalty() {
     if (this.isSolved === false) {
       return 0;
     }
 
-    return Math.floor(this.solvedTimestamp / 60) * 60 + this.failedCount * this.contestPenalty;
+    return this.solvedTimestampToMinute * 60 + this.failedCount * this.contestPenalty;
   }
 
   get penaltyToMinute() {
     return Math.floor(this.penalty / 60);
   }
-
-  get solvedTimestampToMinute() {
-    return Math.floor(this.solvedTimestamp / 60);
-  }
 }

package/src/rank-statistics.ts

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