volleyballsimtypes 0.0.129 → 0.0.130

package/dist/cjs/src/data/transformers/match-rating.js

@@ -9,8 +9,8 @@ function transformToAttributes(team, rating) {
     return {
         match_id: rating.match.id,
         team_id: teamId,
-        p: rating.getWinProbability(team),
-        dR: rating.getRatingChange(team)
+        p: rating.getExpectedResult(),
+        dR: rating.getPoints(team)
     };
 }
 exports.transformFromMatchRating = transformToAttributes;

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

@@ -5,3 +5,7 @@ export * from './iteration';
 export * from './tournament';
 export * from './tournament-match';
 export * from './stage';
+export declare enum _CompetitionType {
+    TOURNAMENT = "TOURNAMENT",
+    LEAGUE = "LEAGUE"
+}

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

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports._CompetitionType = void 0;
 __exportStar(require("./standing"), exports);
 __exportStar(require("./season"), exports);
 __exportStar(require("./league"), exports);
@@ -21,3 +22,8 @@ __exportStar(require("./iteration"), exports);
 __exportStar(require("./tournament"), exports);
 __exportStar(require("./tournament-match"), exports);
 __exportStar(require("./stage"), exports);
+var _CompetitionType;
+(function (_CompetitionType) {
+    _CompetitionType["TOURNAMENT"] = "TOURNAMENT";
+    _CompetitionType["LEAGUE"] = "LEAGUE";
+})(_CompetitionType = exports._CompetitionType || (exports._CompetitionType = {}));

package/dist/cjs/src/service/match/match-rating.d.ts

@@ -1,12 +1,35 @@
 import { Match, MatchTeam } from '.';
+import { _CompetitionType } from '../competition';
 interface MatchRatingOpts {
     readonly match: Match;
+    readonly competitionType: _CompetitionType;
+}
+interface SetScoreVariant {
+    '3-0': number;
+    '3-1': number;
+    '3-2': number;
+    '2-3': number;
+    '1-3': number;
+    '0-3': number;
+}
+interface MatchWeightFactor {
+    TOURNAMENT: number;
+    LEAGUE: number;
 }
 export declare class MatchRating {
     static K: number;
+    static SSV: SetScoreVariant;
+    static C1: number;
+    static C2: number;
+    static C3: number;
+    static C4: number;
+    static C5: number;
+    static MWF: MatchWeightFactor;
     readonly match: Match;
-    constructor({ match }: MatchRatingOpts);
-    getWinProbability(team: MatchTeam): number;
-    getRatingChange(team: MatchTeam): number;
+    readonly weight: number;
+    constructor({ match, competitionType }: MatchRatingOpts);
+    getPoints(team: MatchTeam): number;
+    static calculateProbability(z: number): number;
+    getExpectedResult(): number;
 }
 export {};

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

@@ -2,28 +2,65 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MatchRating = void 0;
 const _1 = require(".");
+const competition_1 = require("../competition");
 class MatchRating {
-    constructor({ match }) {
+    constructor({ match, competitionType }) {
         this.match = match;
+        this.weight = MatchRating.MWF[competitionType];
     }
-    getWinProbability(team) {
-        let rA;
-        let rB;
-        if (team === _1.MatchTeam.HOME) {
-            rA = this.match.homeTeam.rating;
-            rB = this.match.awayTeam.rating;
-        }
-        else {
-            rA = this.match.awayTeam.rating;
-            rB = this.match.homeTeam.rating;
+    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;
+    }
+    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 1 / (1 + Math.pow(10, ((rB - rA) / 400)));
+        return area;
     }
-    getRatingChange(team) {
-        const t = this.match[team === _1.MatchTeam.HOME ? 'homeTeam' : 'awayTeam'];
-        const score = this.match.getWinner().id === t.id ? 1 : 0;
-        return MatchRating.K * (score - this.getWinProbability(team));
+    getExpectedResult() {
+        const D = MatchRating.K * (this.match.homeTeam.rating - this.match.awayTeam.rating) / 1000; // Strength difference between the teams
+        const P1 = MatchRating.calculateProbability(MatchRating.C1 + D); // 3-0
+        const P2 = MatchRating.calculateProbability(MatchRating.C2 + D) -
+            MatchRating.calculateProbability(MatchRating.C1 + D); // 3-1
+        const P3 = MatchRating.calculateProbability(MatchRating.C3 + D) -
+            MatchRating.calculateProbability(MatchRating.C2 + D); // 3-2
+        const P4 = MatchRating.calculateProbability(MatchRating.C4 + D) -
+            MatchRating.calculateProbability(MatchRating.C3 + D); // 2-3
+        const P5 = MatchRating.calculateProbability(MatchRating.C5 + D) -
+            MatchRating.calculateProbability(MatchRating.C4 + D); // 1-3
+        const P6 = 1 - MatchRating.calculateProbability(MatchRating.C5 + D); // 0-3
+        return P1 * MatchRating.SSV['3-0'] +
+            P2 * MatchRating.SSV['3-1'] +
+            P3 * MatchRating.SSV['3-2'] +
+            P4 * MatchRating.SSV['2-3'] +
+            P5 * MatchRating.SSV['1-3'] +
+            P6 * MatchRating.SSV['0-3']; // Expected Match Result EMR
     }
 }
 exports.MatchRating = MatchRating;
-MatchRating.K = 32; // I'll fix this here for medium variance
+MatchRating.K = 8; // Standard scaling factor
+MatchRating.SSV = {
+    [_1.MatchScore['3-0']]: 2,
+    [_1.MatchScore['3-1']]: 1.5,
+    [_1.MatchScore['3-2']]: 1,
+    [_1.MatchScore['2-3']]: -1,
+    [_1.MatchScore['1-3']]: -1.5,
+    [_1.MatchScore['0-3']]: -2
+};
+MatchRating.C1 = -1.060;
+MatchRating.C2 = -0.394;
+MatchRating.C3 = 0;
+MatchRating.C4 = 0.394;
+MatchRating.C5 = 1.060;
+MatchRating.MWF = {
+    [competition_1._CompetitionType.TOURNAMENT]: 50,
+    [competition_1._CompetitionType.LEAGUE]: 35
+};

package/dist/cjs/src/service/match/match.d.ts

@@ -9,6 +9,14 @@ interface MatchOpts {
     readonly sets: MatchSet[];
     readonly isSimulated: boolean;
 }
+export declare enum MatchScore {
+    '3-0' = "3-0",
+    '3-1' = "3-1",
+    '3-2' = "3-2",
+    '2-3' = "2-3",
+    '1-3' = "1-3",
+    '0-3' = "0-3"
+}
 export declare class Match {
     static readonly BEST_OF = 5;
     readonly id: string;
@@ -20,7 +28,9 @@ export declare class Match {
     constructor({ id, homeTeam, awayTeam, scheduledDate, sets, isSimulated }: MatchOpts);
     addSet(set: MatchSet): void;
     getTeamSets(team: MatchTeam): number;
+    getScore(): MatchScore;
     isOver(): boolean;
     getWinner(): Team;
+    isWinner(team: MatchTeam): boolean;
 }
 export {};

package/dist/cjs/src/service/match/match.js

@@ -1,8 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Match = void 0;
+exports.Match = exports.MatchScore = void 0;
 const utils_1 = require("../utils");
 const match_team_1 = require("./match-team");
+var MatchScore;
+(function (MatchScore) {
+    MatchScore["3-0"] = "3-0";
+    MatchScore["3-1"] = "3-1";
+    MatchScore["3-2"] = "3-2";
+    MatchScore["2-3"] = "2-3";
+    MatchScore["1-3"] = "1-3";
+    MatchScore["0-3"] = "0-3";
+})(MatchScore = exports.MatchScore || (exports.MatchScore = {}));
 class Match {
     constructor({ id, homeTeam, awayTeam, scheduledDate, sets, isSimulated }) {
         (0, utils_1.validateUUID)(id);
@@ -21,6 +30,9 @@ class Match {
     getTeamSets(team) {
         return this.sets.reduce((sets, set) => sets + (!set.isOver() ? 0 : set.getWinner() === team ? 1 : 0), 0);
     }
+    getScore() {
+        return `${this.getTeamSets(match_team_1.MatchTeam.HOME)}-${this.getTeamSets(match_team_1.MatchTeam.AWAY)}`;
+    }
     isOver() {
         const gamesRequired = Math.ceil(Match.BEST_OF / 2);
         const lastSet = this.sets.at(-1);
@@ -38,6 +50,12 @@ class Match {
         const awaySets = this.getTeamSets(match_team_1.MatchTeam.AWAY);
         return homeSets > awaySets ? this.homeTeam : this.awayTeam;
     }
+    isWinner(team) {
+        if (team === match_team_1.MatchTeam.HOME && this.getWinner() === this.homeTeam)
+            return true;
+        else
+            return team === match_team_1.MatchTeam.AWAY && this.getWinner() === this.awayTeam;
+    }
 }
 exports.Match = Match;
 Match.BEST_OF = 5;

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

@@ -26,6 +26,6 @@ export declare class Team {
     set rating(value: number);
     isPlayerInRoster(player: Player): boolean;
     toString(): string;
-    updateRating(ratingChange: number): void;
+    updateRating(rankingPoints: number): void;
 }
 export {};

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Team = void 0;
 const utils_1 = require("../utils");
-const match_1 = require("../match");
 class Team {
     constructor({ id, rating, name, shortName, country, roster, coach, league }) {
         (0, utils_1.validateUUID)(id);
@@ -30,10 +29,8 @@ class Team {
         }
         return `${this.name} [${this.shortName}] (${this.country?.name}) ELO=${this._rating}`;
     }
-    updateRating(ratingChange) {
-        if (Math.abs(ratingChange) > match_1.MatchRating.K)
-            throw new Error(`INVALID RATING CHANGE: ${ratingChange}`);
-        this._rating += ratingChange;
+    updateRating(rankingPoints) {
+        this._rating += rankingPoints;
     }
 }
 exports.Team = Team;

package/dist/esm/src/data/transformers/match-rating.js

@@ -6,8 +6,8 @@ function transformToAttributes(team, rating) {
     return {
         match_id: rating.match.id,
         team_id: teamId,
-        p: rating.getWinProbability(team),
-        dR: rating.getRatingChange(team)
+        p: rating.getExpectedResult(),
+        dR: rating.getPoints(team)
     };
 }
 export { transformToAttributes as transformFromMatchRating };

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

@@ -5,3 +5,7 @@ export * from './iteration';
 export * from './tournament';
 export * from './tournament-match';
 export * from './stage';
+export declare enum _CompetitionType {
+    TOURNAMENT = "TOURNAMENT",
+    LEAGUE = "LEAGUE"
+}

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

@@ -5,3 +5,8 @@ export * from './iteration';
 export * from './tournament';
 export * from './tournament-match';
 export * from './stage';
+export var _CompetitionType;
+(function (_CompetitionType) {
+    _CompetitionType["TOURNAMENT"] = "TOURNAMENT";
+    _CompetitionType["LEAGUE"] = "LEAGUE";
+})(_CompetitionType || (_CompetitionType = {}));

package/dist/esm/src/service/match/match-rating.d.ts

@@ -1,12 +1,35 @@
 import { Match, MatchTeam } from '.';
+import { _CompetitionType } from '../competition';
 interface MatchRatingOpts {
     readonly match: Match;
+    readonly competitionType: _CompetitionType;
+}
+interface SetScoreVariant {
+    '3-0': number;
+    '3-1': number;
+    '3-2': number;
+    '2-3': number;
+    '1-3': number;
+    '0-3': number;
+}
+interface MatchWeightFactor {
+    TOURNAMENT: number;
+    LEAGUE: number;
 }
 export declare class MatchRating {
     static K: number;
+    static SSV: SetScoreVariant;
+    static C1: number;
+    static C2: number;
+    static C3: number;
+    static C4: number;
+    static C5: number;
+    static MWF: MatchWeightFactor;
     readonly match: Match;
-    constructor({ match }: MatchRatingOpts);
-    getWinProbability(team: MatchTeam): number;
-    getRatingChange(team: MatchTeam): number;
+    readonly weight: number;
+    constructor({ match, competitionType }: MatchRatingOpts);
+    getPoints(team: MatchTeam): number;
+    static calculateProbability(z: number): number;
+    getExpectedResult(): number;
 }
 export {};

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

@@ -1,25 +1,62 @@
-import { MatchTeam } from '.';
+import { MatchScore } from '.';
+import { _CompetitionType } from '../competition';
 export class MatchRating {
-    constructor({ match }) {
+    constructor({ match, competitionType }) {
         this.match = match;
+        this.weight = MatchRating.MWF[competitionType];
     }
-    getWinProbability(team) {
-        let rA;
-        let rB;
-        if (team === MatchTeam.HOME) {
-            rA = this.match.homeTeam.rating;
-            rB = this.match.awayTeam.rating;
-        }
-        else {
-            rA = this.match.awayTeam.rating;
-            rB = this.match.homeTeam.rating;
+    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;
+    }
+    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 1 / (1 + Math.pow(10, ((rB - rA) / 400)));
+        return area;
     }
-    getRatingChange(team) {
-        const t = this.match[team === MatchTeam.HOME ? 'homeTeam' : 'awayTeam'];
-        const score = this.match.getWinner().id === t.id ? 1 : 0;
-        return MatchRating.K * (score - this.getWinProbability(team));
+    getExpectedResult() {
+        const D = MatchRating.K * (this.match.homeTeam.rating - this.match.awayTeam.rating) / 1000; // Strength difference between the teams
+        const P1 = MatchRating.calculateProbability(MatchRating.C1 + D); // 3-0
+        const P2 = MatchRating.calculateProbability(MatchRating.C2 + D) -
+            MatchRating.calculateProbability(MatchRating.C1 + D); // 3-1
+        const P3 = MatchRating.calculateProbability(MatchRating.C3 + D) -
+            MatchRating.calculateProbability(MatchRating.C2 + D); // 3-2
+        const P4 = MatchRating.calculateProbability(MatchRating.C4 + D) -
+            MatchRating.calculateProbability(MatchRating.C3 + D); // 2-3
+        const P5 = MatchRating.calculateProbability(MatchRating.C5 + D) -
+            MatchRating.calculateProbability(MatchRating.C4 + D); // 1-3
+        const P6 = 1 - MatchRating.calculateProbability(MatchRating.C5 + D); // 0-3
+        return P1 * MatchRating.SSV['3-0'] +
+            P2 * MatchRating.SSV['3-1'] +
+            P3 * MatchRating.SSV['3-2'] +
+            P4 * MatchRating.SSV['2-3'] +
+            P5 * MatchRating.SSV['1-3'] +
+            P6 * MatchRating.SSV['0-3']; // Expected Match Result EMR
     }
 }
-MatchRating.K = 32; // I'll fix this here for medium variance
+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
+};
+MatchRating.C1 = -1.060;
+MatchRating.C2 = -0.394;
+MatchRating.C3 = 0;
+MatchRating.C4 = 0.394;
+MatchRating.C5 = 1.060;
+MatchRating.MWF = {
+    [_CompetitionType.TOURNAMENT]: 50,
+    [_CompetitionType.LEAGUE]: 35
+};

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

@@ -9,6 +9,14 @@ interface MatchOpts {
     readonly sets: MatchSet[];
     readonly isSimulated: boolean;
 }
+export declare enum MatchScore {
+    '3-0' = "3-0",
+    '3-1' = "3-1",
+    '3-2' = "3-2",
+    '2-3' = "2-3",
+    '1-3' = "1-3",
+    '0-3' = "0-3"
+}
 export declare class Match {
     static readonly BEST_OF = 5;
     readonly id: string;
@@ -20,7 +28,9 @@ export declare class Match {
     constructor({ id, homeTeam, awayTeam, scheduledDate, sets, isSimulated }: MatchOpts);
     addSet(set: MatchSet): void;
     getTeamSets(team: MatchTeam): number;
+    getScore(): MatchScore;
     isOver(): boolean;
     getWinner(): Team;
+    isWinner(team: MatchTeam): boolean;
 }
 export {};

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

@@ -1,5 +1,14 @@
 import { validateUUID } from '../utils';
 import { MatchTeam } from './match-team';
+export var MatchScore;
+(function (MatchScore) {
+    MatchScore["3-0"] = "3-0";
+    MatchScore["3-1"] = "3-1";
+    MatchScore["3-2"] = "3-2";
+    MatchScore["2-3"] = "2-3";
+    MatchScore["1-3"] = "1-3";
+    MatchScore["0-3"] = "0-3";
+})(MatchScore || (MatchScore = {}));
 export class Match {
     constructor({ id, homeTeam, awayTeam, scheduledDate, sets, isSimulated }) {
         validateUUID(id);
@@ -18,6 +27,9 @@ export class Match {
     getTeamSets(team) {
         return this.sets.reduce((sets, set) => sets + (!set.isOver() ? 0 : set.getWinner() === team ? 1 : 0), 0);
     }
+    getScore() {
+        return `${this.getTeamSets(MatchTeam.HOME)}-${this.getTeamSets(MatchTeam.AWAY)}`;
+    }
     isOver() {
         const gamesRequired = Math.ceil(Match.BEST_OF / 2);
         const lastSet = this.sets.at(-1);
@@ -35,5 +47,11 @@ export class Match {
         const awaySets = this.getTeamSets(MatchTeam.AWAY);
         return homeSets > awaySets ? this.homeTeam : this.awayTeam;
     }
+    isWinner(team) {
+        if (team === MatchTeam.HOME && this.getWinner() === this.homeTeam)
+            return true;
+        else
+            return team === MatchTeam.AWAY && this.getWinner() === this.awayTeam;
+    }
 }
 Match.BEST_OF = 5;

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

@@ -26,6 +26,6 @@ export declare class Team {
     set rating(value: number);
     isPlayerInRoster(player: Player): boolean;
     toString(): string;
-    updateRating(ratingChange: number): void;
+    updateRating(rankingPoints: number): void;
 }
 export {};

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

@@ -1,5 +1,4 @@
 import { validateUUID } from '../utils';
-import { MatchRating } from '../match';
 export class Team {
     constructor({ id, rating, name, shortName, country, roster, coach, league }) {
         validateUUID(id);
@@ -27,9 +26,7 @@ export class Team {
         }
         return `${this.name} [${this.shortName}] (${this.country?.name}) ELO=${this._rating}`;
     }
-    updateRating(ratingChange) {
-        if (Math.abs(ratingChange) > MatchRating.K)
-            throw new Error(`INVALID RATING CHANGE: ${ratingChange}`);
-        this._rating += ratingChange;
+    updateRating(rankingPoints) {
+        this._rating += rankingPoints;
     }
 }

package/package.json

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