volleyballsimtypes 0.0.187 → 0.0.189

package/dist/cjs/src/data/models/box-score.d.ts

@@ -21,6 +21,7 @@ export interface BoxScoreAttributes {
     block_touches: number;
     setting_assists: number;
     setting_errors: number;
+    setting_pass: number;
     defense_digs: number;
     defense_errors: number;
     misc_points_played: number;
@@ -52,6 +53,7 @@ export declare class BoxScoreModel extends Model<BoxScoreAttributes, BoxScoreCre
     block_touches: number;
     setting_assists: number;
     setting_errors: number;
+    setting_pass: number;
     defense_digs: number;
     defense_errors: number;
     misc_points_played: number;

package/dist/cjs/src/data/models/box-score.js

@@ -113,6 +113,11 @@ class BoxScoreModel extends sequelize_1.Model {
                 allowNull: false,
                 defaultValue: 0
             },
+            setting_pass: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false,
+                defaultValue: 0
+            },
             // Defense
             defense_digs: {
                 type: sequelize_1.DataTypes.INTEGER,

package/dist/cjs/src/data/transformers/box-score.js

@@ -22,6 +22,7 @@ function transformToAttributes(boxScore) {
         block_touches: boxScore.block.touches,
         setting_assists: boxScore.setting.assists,
         setting_errors: boxScore.setting.errors,
+        setting_pass: boxScore.setting.pass,
         defense_digs: boxScore.defense.digs,
         defense_errors: boxScore.defense.errors,
         misc_points_played: boxScore.misc.pointsPlayed,
@@ -61,6 +62,7 @@ function transformToObject(model) {
         },
         setting: {
             assists: model.setting_assists,
+            pass: model.setting_pass,
             errors: model.setting_errors
         },
         defense: {

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

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

package/dist/cjs/src/service/match/box-score.d.ts

@@ -24,6 +24,7 @@ export interface BlockStats {
 export interface SettingStats {
     assists: number;
     errors: number;
+    pass: number;
 }
 export interface DefenseStats {
     digs: number;

package/dist/cjs/src/service/match/box-score.js

@@ -35,7 +35,8 @@ const createEmptyBlockStats = () => ({
 exports.createEmptyBlockStats = createEmptyBlockStats;
 const createEmptySettingStats = () => ({
     assists: 0,
-    errors: 0
+    errors: 0,
+    pass: 0
 });
 exports.createEmptySettingStats = createEmptySettingStats;
 const createEmptyDefenseStats = () => ({

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

@@ -2,27 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MatchRating = void 0;
 const _1 = require(".");
+const utils_1 = require("../utils");
 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 === _1.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 + (0, utils_1.erf)(z / Math.SQRT2));
     }
     getExpectedResult() {
         const D = MatchRating.K * (this.match.homeTeam.rating - this.match.awayTeam.rating) / 1000; // Strength difference between the teams
@@ -47,12 +41,12 @@ class MatchRating {
 exports.MatchRating = MatchRating;
 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
+    '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/cjs/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/cjs/src/service/utils/number-utils.js

@@ -1,7 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clamp = void 0;
+exports.erf = exports.clamp = void 0;
 function clamp(min, max, value) {
     return Math.max(min, Math.min(value, max));
 }
 exports.clamp = clamp;
+// Approximation of the error function
+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;
+}
+exports.erf = erf;

package/dist/esm/src/data/models/box-score.d.ts

@@ -21,6 +21,7 @@ export interface BoxScoreAttributes {
     block_touches: number;
     setting_assists: number;
     setting_errors: number;
+    setting_pass: number;
     defense_digs: number;
     defense_errors: number;
     misc_points_played: number;
@@ -52,6 +53,7 @@ export declare class BoxScoreModel extends Model<BoxScoreAttributes, BoxScoreCre
     block_touches: number;
     setting_assists: number;
     setting_errors: number;
+    setting_pass: number;
     defense_digs: number;
     defense_errors: number;
     misc_points_played: number;

package/dist/esm/src/data/models/box-score.js

@@ -110,6 +110,11 @@ export class BoxScoreModel extends Model {
                 allowNull: false,
                 defaultValue: 0
             },
+            setting_pass: {
+                type: DataTypes.INTEGER,
+                allowNull: false,
+                defaultValue: 0
+            },
             // Defense
             defense_digs: {
                 type: DataTypes.INTEGER,

package/dist/esm/src/data/transformers/box-score.js

@@ -19,6 +19,7 @@ function transformToAttributes(boxScore) {
         block_touches: boxScore.block.touches,
         setting_assists: boxScore.setting.assists,
         setting_errors: boxScore.setting.errors,
+        setting_pass: boxScore.setting.pass,
         defense_digs: boxScore.defense.digs,
         defense_errors: boxScore.defense.errors,
         misc_points_played: boxScore.misc.pointsPlayed,
@@ -57,6 +58,7 @@ function transformToObject(model) {
         },
         setting: {
             assists: model.setting_assists,
+            pass: model.setting_pass,
             errors: model.setting_errors
         },
         defense: {

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/match/box-score.d.ts

@@ -24,6 +24,7 @@ export interface BlockStats {
 export interface SettingStats {
     assists: number;
     errors: number;
+    pass: number;
 }
 export interface DefenseStats {
     digs: number;

package/dist/esm/src/service/match/box-score.js

@@ -28,7 +28,8 @@ export const createEmptyBlockStats = () => ({
 });
 export const createEmptySettingStats = () => ({
     assists: 0,
-    errors: 0
+    errors: 0,
+    pass: 0
 });
 export const createEmptyDefenseStats = () => ({
     digs: 0,

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/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.187",
+  "version": "0.0.189",
   "description": "vbsim types",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",