volleyballsimtypes 0.0.188 → 0.0.190

package/dist/esm/src/service/coach/formation.js

@@ -28,7 +28,7 @@ Formation['5-1'] = new Formation({
         3: [RoleEnum.MIDDLE_BLOCKER],
         4: [RoleEnum.OUTSIDE_HITTER],
         5: [RoleEnum.OUTSIDE_HITTER],
-        6: [RoleEnum.LIBERO]
+        6: [RoleEnum.LIBERO, RoleEnum.MIDDLE_BLOCKER]
     },
     draftingPriorities: [
         [RoleEnum.SETTER, RoleEnum.OPPOSITE_HITTER],
@@ -50,20 +50,20 @@ Formation['5-1'] = new Formation({
 Formation['4-2'] = new Formation({
     name: '4-2',
     initialRotation: {
-        1: [RoleEnum.MIDDLE_BLOCKER],
-        2: [RoleEnum.SETTER],
-        3: [RoleEnum.OUTSIDE_HITTER],
-        4: [RoleEnum.MIDDLE_BLOCKER],
-        5: [RoleEnum.SETTER],
-        6: [RoleEnum.OPPOSITE_HITTER]
+        1: [RoleEnum.SETTER],
+        2: [RoleEnum.OUTSIDE_HITTER],
+        3: [RoleEnum.MIDDLE_BLOCKER],
+        4: [RoleEnum.SETTER],
+        5: [RoleEnum.OUTSIDE_HITTER],
+        6: [RoleEnum.MIDDLE_BLOCKER]
     },
     base: {
         1: [RoleEnum.SETTER],
-        2: [RoleEnum.OPPOSITE_HITTER, RoleEnum.SETTER],
+        2: [RoleEnum.SETTER],
         3: [RoleEnum.MIDDLE_BLOCKER],
         4: [RoleEnum.OUTSIDE_HITTER],
         5: [RoleEnum.OUTSIDE_HITTER],
-        6: [RoleEnum.LIBERO]
+        6: [RoleEnum.LIBERO, RoleEnum.MIDDLE_BLOCKER]
     },
     draftingPriorities: [
         [RoleEnum.SETTER, RoleEnum.OPPOSITE_HITTER],
@@ -85,20 +85,20 @@ Formation['4-2'] = new Formation({
 Formation['6-2'] = new Formation({
     name: '6-2',
     initialRotation: {
-        1: [RoleEnum.OPPOSITE_HITTER, RoleEnum.SETTER],
+        1: [RoleEnum.OPPOSITE_HITTER, RoleEnum.SETTER, RoleEnum.OUTSIDE_HITTER],
         2: [RoleEnum.OUTSIDE_HITTER],
         3: [RoleEnum.MIDDLE_BLOCKER],
-        4: [RoleEnum.OPPOSITE_HITTER, RoleEnum.SETTER],
+        4: [RoleEnum.OPPOSITE_HITTER, RoleEnum.SETTER, RoleEnum.OUTSIDE_HITTER],
         5: [RoleEnum.OUTSIDE_HITTER],
         6: [RoleEnum.MIDDLE_BLOCKER]
     },
     base: {
-        1: [RoleEnum.SETTER],
+        1: [RoleEnum.SETTER, RoleEnum.OPPOSITE_HITTER],
         2: [RoleEnum.OPPOSITE_HITTER, RoleEnum.SETTER],
         3: [RoleEnum.MIDDLE_BLOCKER],
         4: [RoleEnum.OUTSIDE_HITTER],
         5: [RoleEnum.OUTSIDE_HITTER],
-        6: [RoleEnum.LIBERO]
+        6: [RoleEnum.LIBERO, RoleEnum.MIDDLE_BLOCKER]
     },
     draftingPriorities: [
         [RoleEnum.SETTER, RoleEnum.OPPOSITE_HITTER],

package/dist/esm/src/service/competition/division.d.ts

@@ -0,0 +1,15 @@
+import { Season } from './season';
+interface DivisionOpts {
+    readonly id: string;
+    readonly name: string;
+    readonly tier: number;
+    readonly seasons: Season[];
+}
+export declare class Division {
+    readonly id: string;
+    readonly name: string;
+    readonly tier: number;
+    readonly seasons: Season[];
+    constructor({ id, name, tier, seasons }: DivisionOpts);
+}
+export {};

package/dist/esm/src/service/competition/division.js

@@ -0,0 +1,8 @@
+export class Division {
+    constructor({ id, name, tier, seasons }) {
+        this.id = id;
+        this.name = name;
+        this.tier = tier;
+        this.seasons = seasons;
+    }
+}

package/dist/esm/src/service/competition/index.d.ts

@@ -1,6 +1,7 @@
 export * from './standing';
 export * from './season';
 export * from './league';
+export * from './division';
 export * from './iteration';
 export * from './tournament';
 export * from './tournament-match';

package/dist/esm/src/service/competition/index.js

@@ -1,6 +1,7 @@
 export * from './standing';
 export * from './season';
 export * from './league';
+export * from './division';
 export * from './iteration';
 export * from './tournament';
 export * from './tournament-match';

package/dist/esm/src/service/competition/league.d.ts

@@ -1,16 +1,16 @@
-import { Season } from './season';
 import { Country } from '../country';
+import { Division } from './division';
 interface LeagueOpts {
     readonly id: string;
     readonly name: string;
     readonly country: Country;
-    readonly seasons: Season[];
+    readonly division: Division[];
 }
 export declare class League {
     readonly id: string;
     readonly name: string;
-    readonly seasons: Season[];
+    readonly division: Division[];
     readonly country: Country;
-    constructor({ id, name, country, seasons }: LeagueOpts);
+    constructor({ id, name, country, division }: LeagueOpts);
 }
 export {};

package/dist/esm/src/service/competition/league.js

@@ -1,8 +1,8 @@
 export class League {
-    constructor({ id, name, country, seasons }) {
+    constructor({ id, name, country, division }) {
         this.id = id;
         this.name = name;
         this.country = country;
-        this.seasons = seasons;
+        this.division = division;
     }
 }

package/dist/esm/src/service/match/match-rating.js

@@ -1,25 +1,19 @@
-import { MatchScore } from '.';
+import { MatchTeam } from '.';
+import { erf } from '../utils';
 export class MatchRating {
     constructor({ match, competitionType }) {
         this.match = match;
         this.weight = MatchRating.MWF[competitionType];
     }
     getPoints(team) {
-        const rankingValue = MatchRating.SSV[this.match.getScore()] - this.getExpectedResult();
-        const weighted = rankingValue * this.weight / MatchRating.K;
-        if (this.match.isWinner(team))
-            return weighted;
-        else
-            return weighted * -1;
+        const homeScoreKey = this.match.getScore();
+        const emr = this.getExpectedResult();
+        const ssv = MatchRating.SSV[homeScoreKey];
+        const homeDelta = (ssv - emr) * this.weight / MatchRating.K;
+        return team === MatchTeam.HOME ? homeDelta : -homeDelta;
     }
     static calculateProbability(z) {
-        let area = 0.0;
-        const rectangles = 100000;
-        const width = (z - (-10)) / rectangles;
-        for (let i = 0; i < rectangles; i++) {
-            area += width * Math.exp(-Math.pow((width * i + (-10)), 2) / 2) / Math.sqrt(2 * Math.PI);
-        }
-        return area;
+        return 0.5 * (1 + erf(z / Math.SQRT2));
     }
     getExpectedResult() {
         const D = MatchRating.K * (this.match.homeTeam.rating - this.match.awayTeam.rating) / 1000; // Strength difference between the teams
@@ -43,12 +37,12 @@ export class MatchRating {
 }
 MatchRating.K = 8; // Standard scaling factor
 MatchRating.SSV = {
-    [MatchScore['3-0']]: 2,
-    [MatchScore['3-1']]: 1.5,
-    [MatchScore['3-2']]: 1,
-    [MatchScore['2-3']]: -1,
-    [MatchScore['1-3']]: -1.5,
-    [MatchScore['0-3']]: -2
+    '3-0': 2,
+    '3-1': 1.5,
+    '3-2': 1,
+    '2-3': -1,
+    '1-3': -1.5,
+    '0-3': -2
 };
 MatchRating.C1 = -1.060;
 MatchRating.C2 = -0.394;

package/dist/esm/src/service/team/team.d.ts

@@ -1,7 +1,6 @@
 import { Coach } from '../coach';
 import { Player } from '../player';
 import { Country } from '../country';
-import { League } from '../competition';
 interface TeamParams {
     readonly id: string;
     readonly rating: number;
@@ -9,7 +8,6 @@ interface TeamParams {
     readonly shortName: string;
     readonly roster: Player[];
     readonly country?: Country;
-    readonly league?: League;
     readonly coach?: Coach;
 }
 export declare class Team {
@@ -18,10 +16,9 @@ export declare class Team {
     readonly name: string;
     readonly shortName: string;
     readonly coach?: Coach;
-    readonly league?: League;
     readonly country?: Country;
     private _rating;
-    constructor({ id, rating, name, shortName, country, roster, coach, league }: TeamParams);
+    constructor({ id, rating, name, shortName, country, roster, coach }: TeamParams);
     get rating(): number;
     set rating(value: number);
     isPlayerInRoster(player: Player): boolean;

package/dist/esm/src/service/team/team.js

@@ -1,6 +1,6 @@
 import { validateUUID } from '../utils';
 export class Team {
-    constructor({ id, rating, name, shortName, country, roster, coach, league }) {
+    constructor({ id, rating, name, shortName, country, roster, coach }) {
         validateUUID(id);
         this.id = id;
         this._rating = rating;
@@ -9,7 +9,6 @@ export class Team {
         this.name = name;
         this.shortName = shortName;
         this.country = country;
-        this.league = league;
     }
     get rating() {
         return this._rating;

package/dist/esm/src/service/utils/number-utils.d.ts

@@ -1 +1,2 @@
 export declare function clamp(min: number, max: number, value: number): number;
+export declare function erf(x: number): number;

package/dist/esm/src/service/utils/number-utils.js

@@ -1,3 +1,20 @@
 export function clamp(min, max, value) {
     return Math.max(min, Math.min(value, max));
 }
+// Approximation of the error function
+export function erf(x) {
+    // constants
+    const a1 = 0.254829592;
+    const a2 = -0.284496736;
+    const a3 = 1.421413741;
+    const a4 = -1.453152027;
+    const a5 = 1.061405429;
+    const p = 0.3275911;
+    // Save the sign of x
+    const sign = x < 0 ? -1 : 1;
+    x = Math.abs(x);
+    // Abramowitz & Stegun 7.1.26
+    const t = 1.0 / (1.0 + p * x);
+    const y = 1.0 - ((((a5 * t + a4) * t + a3) * t + a2) * t + a1) * t * Math.exp(-x * x);
+    return sign * y;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "volleyballsimtypes",
-  "version": "0.0.188",
+  "version": "0.0.190",
   "description": "vbsim types",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",

package/dist/cjs/src/data/models/league-season.d.ts

@@ -1,23 +0,0 @@
-import * as Sequelize from 'sequelize';
-import { Model } from 'sequelize';
-import { CompetitionId, CompetitionModel, LeagueId, LeagueModel } from '.';
-export interface LeagueSeasonAttributes {
-    league_id: string;
-    competition_id: string;
-}
-export type LeagueSeasonPk = 'competition_id';
-export type LeagueSeasonId = LeagueSeasonModel[LeagueSeasonPk];
-export type LeagueSeasonCreationAttributes = LeagueSeasonAttributes;
-export declare class LeagueSeasonModel extends Model<LeagueSeasonAttributes, LeagueSeasonCreationAttributes> implements LeagueSeasonAttributes {
-    league_id: string;
-    competition_id: string;
-    competition: CompetitionModel;
-    getCompetition: Sequelize.BelongsToGetAssociationMixin<CompetitionModel>;
-    setCompetition: Sequelize.BelongsToSetAssociationMixin<CompetitionModel, CompetitionId>;
-    createCompetition: Sequelize.BelongsToCreateAssociationMixin<CompetitionModel>;
-    league: LeagueModel;
-    getLeague: Sequelize.BelongsToGetAssociationMixin<LeagueModel>;
-    setLeague: Sequelize.BelongsToSetAssociationMixin<LeagueModel, LeagueId>;
-    createLeague: Sequelize.BelongsToCreateAssociationMixin<LeagueModel>;
-    static initModel(sequelize: Sequelize.Sequelize): typeof LeagueSeasonModel;
-}

package/dist/esm/src/data/models/league-season.d.ts

@@ -1,23 +0,0 @@
-import * as Sequelize from 'sequelize';
-import { Model } from 'sequelize';
-import { CompetitionId, CompetitionModel, LeagueId, LeagueModel } from '.';
-export interface LeagueSeasonAttributes {
-    league_id: string;
-    competition_id: string;
-}
-export type LeagueSeasonPk = 'competition_id';
-export type LeagueSeasonId = LeagueSeasonModel[LeagueSeasonPk];
-export type LeagueSeasonCreationAttributes = LeagueSeasonAttributes;
-export declare class LeagueSeasonModel extends Model<LeagueSeasonAttributes, LeagueSeasonCreationAttributes> implements LeagueSeasonAttributes {
-    league_id: string;
-    competition_id: string;
-    competition: CompetitionModel;
-    getCompetition: Sequelize.BelongsToGetAssociationMixin<CompetitionModel>;
-    setCompetition: Sequelize.BelongsToSetAssociationMixin<CompetitionModel, CompetitionId>;
-    createCompetition: Sequelize.BelongsToCreateAssociationMixin<CompetitionModel>;
-    league: LeagueModel;
-    getLeague: Sequelize.BelongsToGetAssociationMixin<LeagueModel>;
-    setLeague: Sequelize.BelongsToSetAssociationMixin<LeagueModel, LeagueId>;
-    createLeague: Sequelize.BelongsToCreateAssociationMixin<LeagueModel>;
-    static initModel(sequelize: Sequelize.Sequelize): typeof LeagueSeasonModel;
-}