volleyballsimtypes 0.0.188 → 0.0.189

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -32,7 +32,7 @@ Formation['5-1'] = new Formation({
32
32
  3: [player_1.RoleEnum.MIDDLE_BLOCKER],
33
33
  4: [player_1.RoleEnum.OUTSIDE_HITTER],
34
34
  5: [player_1.RoleEnum.OUTSIDE_HITTER],
35
- 6: [player_1.RoleEnum.LIBERO]
35
+ 6: [player_1.RoleEnum.LIBERO, player_1.RoleEnum.MIDDLE_BLOCKER]
36
36
  },
37
37
  draftingPriorities: [
38
38
  [player_1.RoleEnum.SETTER, player_1.RoleEnum.OPPOSITE_HITTER],
@@ -54,20 +54,20 @@ Formation['5-1'] = new Formation({
54
54
  Formation['4-2'] = new Formation({
55
55
  name: '4-2',
56
56
  initialRotation: {
57
- 1: [player_1.RoleEnum.MIDDLE_BLOCKER],
58
- 2: [player_1.RoleEnum.SETTER],
59
- 3: [player_1.RoleEnum.OUTSIDE_HITTER],
60
- 4: [player_1.RoleEnum.MIDDLE_BLOCKER],
61
- 5: [player_1.RoleEnum.SETTER],
62
- 6: [player_1.RoleEnum.OPPOSITE_HITTER]
57
+ 1: [player_1.RoleEnum.SETTER],
58
+ 2: [player_1.RoleEnum.OUTSIDE_HITTER],
59
+ 3: [player_1.RoleEnum.MIDDLE_BLOCKER],
60
+ 4: [player_1.RoleEnum.SETTER],
61
+ 5: [player_1.RoleEnum.OUTSIDE_HITTER],
62
+ 6: [player_1.RoleEnum.MIDDLE_BLOCKER]
63
63
  },
64
64
  base: {
65
65
  1: [player_1.RoleEnum.SETTER],
66
- 2: [player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.SETTER],
66
+ 2: [player_1.RoleEnum.SETTER],
67
67
  3: [player_1.RoleEnum.MIDDLE_BLOCKER],
68
68
  4: [player_1.RoleEnum.OUTSIDE_HITTER],
69
69
  5: [player_1.RoleEnum.OUTSIDE_HITTER],
70
- 6: [player_1.RoleEnum.LIBERO]
70
+ 6: [player_1.RoleEnum.LIBERO, player_1.RoleEnum.MIDDLE_BLOCKER]
71
71
  },
72
72
  draftingPriorities: [
73
73
  [player_1.RoleEnum.SETTER, player_1.RoleEnum.OPPOSITE_HITTER],
@@ -89,20 +89,20 @@ Formation['4-2'] = new Formation({
89
89
  Formation['6-2'] = new Formation({
90
90
  name: '6-2',
91
91
  initialRotation: {
92
- 1: [player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.SETTER],
92
+ 1: [player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.SETTER, player_1.RoleEnum.OUTSIDE_HITTER],
93
93
  2: [player_1.RoleEnum.OUTSIDE_HITTER],
94
94
  3: [player_1.RoleEnum.MIDDLE_BLOCKER],
95
- 4: [player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.SETTER],
95
+ 4: [player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.SETTER, player_1.RoleEnum.OUTSIDE_HITTER],
96
96
  5: [player_1.RoleEnum.OUTSIDE_HITTER],
97
97
  6: [player_1.RoleEnum.MIDDLE_BLOCKER]
98
98
  },
99
99
  base: {
100
- 1: [player_1.RoleEnum.SETTER],
100
+ 1: [player_1.RoleEnum.SETTER, player_1.RoleEnum.OPPOSITE_HITTER],
101
101
  2: [player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.SETTER],
102
102
  3: [player_1.RoleEnum.MIDDLE_BLOCKER],
103
103
  4: [player_1.RoleEnum.OUTSIDE_HITTER],
104
104
  5: [player_1.RoleEnum.OUTSIDE_HITTER],
105
- 6: [player_1.RoleEnum.LIBERO]
105
+ 6: [player_1.RoleEnum.LIBERO, player_1.RoleEnum.MIDDLE_BLOCKER]
106
106
  },
107
107
  draftingPriorities: [
108
108
  [player_1.RoleEnum.SETTER, player_1.RoleEnum.OPPOSITE_HITTER],
@@ -2,27 +2,21 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.MatchRating = void 0;
4
4
  const _1 = require(".");
5
+ const utils_1 = require("../utils");
5
6
  class MatchRating {
6
7
  constructor({ match, competitionType }) {
7
8
  this.match = match;
8
9
  this.weight = MatchRating.MWF[competitionType];
9
10
  }
10
11
  getPoints(team) {
11
- const rankingValue = MatchRating.SSV[this.match.getScore()] - this.getExpectedResult();
12
- const weighted = rankingValue * this.weight / MatchRating.K;
13
- if (this.match.isWinner(team))
14
- return weighted;
15
- else
16
- return weighted * -1;
12
+ const homeScoreKey = this.match.getScore();
13
+ const emr = this.getExpectedResult();
14
+ const ssv = MatchRating.SSV[homeScoreKey];
15
+ const homeDelta = (ssv - emr) * this.weight / MatchRating.K;
16
+ return team === _1.MatchTeam.HOME ? homeDelta : -homeDelta;
17
17
  }
18
18
  static calculateProbability(z) {
19
- let area = 0.0;
20
- const rectangles = 100000;
21
- const width = (z - (-10)) / rectangles;
22
- for (let i = 0; i < rectangles; i++) {
23
- area += width * Math.exp(-Math.pow((width * i + (-10)), 2) / 2) / Math.sqrt(2 * Math.PI);
24
- }
25
- return area;
19
+ return 0.5 * (1 + (0, utils_1.erf)(z / Math.SQRT2));
26
20
  }
27
21
  getExpectedResult() {
28
22
  const D = MatchRating.K * (this.match.homeTeam.rating - this.match.awayTeam.rating) / 1000; // Strength difference between the teams
@@ -47,12 +41,12 @@ class MatchRating {
47
41
  exports.MatchRating = MatchRating;
48
42
  MatchRating.K = 8; // Standard scaling factor
49
43
  MatchRating.SSV = {
50
- [_1.MatchScore['3-0']]: 2,
51
- [_1.MatchScore['3-1']]: 1.5,
52
- [_1.MatchScore['3-2']]: 1,
53
- [_1.MatchScore['2-3']]: -1,
54
- [_1.MatchScore['1-3']]: -1.5,
55
- [_1.MatchScore['0-3']]: -2
44
+ '3-0': 2,
45
+ '3-1': 1.5,
46
+ '3-2': 1,
47
+ '2-3': -1,
48
+ '1-3': -1.5,
49
+ '0-3': -2
56
50
  };
57
51
  MatchRating.C1 = -1.060;
58
52
  MatchRating.C2 = -0.394;
@@ -1 +1,2 @@
1
1
  export declare function clamp(min: number, max: number, value: number): number;
2
+ export declare function erf(x: number): number;
@@ -1,7 +1,25 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.clamp = void 0;
3
+ exports.erf = exports.clamp = void 0;
4
4
  function clamp(min, max, value) {
5
5
  return Math.max(min, Math.min(value, max));
6
6
  }
7
7
  exports.clamp = clamp;
8
+ // Approximation of the error function
9
+ function erf(x) {
10
+ // constants
11
+ const a1 = 0.254829592;
12
+ const a2 = -0.284496736;
13
+ const a3 = 1.421413741;
14
+ const a4 = -1.453152027;
15
+ const a5 = 1.061405429;
16
+ const p = 0.3275911;
17
+ // Save the sign of x
18
+ const sign = x < 0 ? -1 : 1;
19
+ x = Math.abs(x);
20
+ // Abramowitz & Stegun 7.1.26
21
+ const t = 1.0 / (1.0 + p * x);
22
+ const y = 1.0 - ((((a5 * t + a4) * t + a3) * t + a2) * t + a1) * t * Math.exp(-x * x);
23
+ return sign * y;
24
+ }
25
+ exports.erf = erf;
@@ -28,7 +28,7 @@ Formation['5-1'] = new Formation({
28
28
  3: [RoleEnum.MIDDLE_BLOCKER],
29
29
  4: [RoleEnum.OUTSIDE_HITTER],
30
30
  5: [RoleEnum.OUTSIDE_HITTER],
31
- 6: [RoleEnum.LIBERO]
31
+ 6: [RoleEnum.LIBERO, RoleEnum.MIDDLE_BLOCKER]
32
32
  },
33
33
  draftingPriorities: [
34
34
  [RoleEnum.SETTER, RoleEnum.OPPOSITE_HITTER],
@@ -50,20 +50,20 @@ Formation['5-1'] = new Formation({
50
50
  Formation['4-2'] = new Formation({
51
51
  name: '4-2',
52
52
  initialRotation: {
53
- 1: [RoleEnum.MIDDLE_BLOCKER],
54
- 2: [RoleEnum.SETTER],
55
- 3: [RoleEnum.OUTSIDE_HITTER],
56
- 4: [RoleEnum.MIDDLE_BLOCKER],
57
- 5: [RoleEnum.SETTER],
58
- 6: [RoleEnum.OPPOSITE_HITTER]
53
+ 1: [RoleEnum.SETTER],
54
+ 2: [RoleEnum.OUTSIDE_HITTER],
55
+ 3: [RoleEnum.MIDDLE_BLOCKER],
56
+ 4: [RoleEnum.SETTER],
57
+ 5: [RoleEnum.OUTSIDE_HITTER],
58
+ 6: [RoleEnum.MIDDLE_BLOCKER]
59
59
  },
60
60
  base: {
61
61
  1: [RoleEnum.SETTER],
62
- 2: [RoleEnum.OPPOSITE_HITTER, RoleEnum.SETTER],
62
+ 2: [RoleEnum.SETTER],
63
63
  3: [RoleEnum.MIDDLE_BLOCKER],
64
64
  4: [RoleEnum.OUTSIDE_HITTER],
65
65
  5: [RoleEnum.OUTSIDE_HITTER],
66
- 6: [RoleEnum.LIBERO]
66
+ 6: [RoleEnum.LIBERO, RoleEnum.MIDDLE_BLOCKER]
67
67
  },
68
68
  draftingPriorities: [
69
69
  [RoleEnum.SETTER, RoleEnum.OPPOSITE_HITTER],
@@ -85,20 +85,20 @@ Formation['4-2'] = new Formation({
85
85
  Formation['6-2'] = new Formation({
86
86
  name: '6-2',
87
87
  initialRotation: {
88
- 1: [RoleEnum.OPPOSITE_HITTER, RoleEnum.SETTER],
88
+ 1: [RoleEnum.OPPOSITE_HITTER, RoleEnum.SETTER, RoleEnum.OUTSIDE_HITTER],
89
89
  2: [RoleEnum.OUTSIDE_HITTER],
90
90
  3: [RoleEnum.MIDDLE_BLOCKER],
91
- 4: [RoleEnum.OPPOSITE_HITTER, RoleEnum.SETTER],
91
+ 4: [RoleEnum.OPPOSITE_HITTER, RoleEnum.SETTER, RoleEnum.OUTSIDE_HITTER],
92
92
  5: [RoleEnum.OUTSIDE_HITTER],
93
93
  6: [RoleEnum.MIDDLE_BLOCKER]
94
94
  },
95
95
  base: {
96
- 1: [RoleEnum.SETTER],
96
+ 1: [RoleEnum.SETTER, RoleEnum.OPPOSITE_HITTER],
97
97
  2: [RoleEnum.OPPOSITE_HITTER, RoleEnum.SETTER],
98
98
  3: [RoleEnum.MIDDLE_BLOCKER],
99
99
  4: [RoleEnum.OUTSIDE_HITTER],
100
100
  5: [RoleEnum.OUTSIDE_HITTER],
101
- 6: [RoleEnum.LIBERO]
101
+ 6: [RoleEnum.LIBERO, RoleEnum.MIDDLE_BLOCKER]
102
102
  },
103
103
  draftingPriorities: [
104
104
  [RoleEnum.SETTER, RoleEnum.OPPOSITE_HITTER],
@@ -1,25 +1,19 @@
1
- import { MatchScore } from '.';
1
+ import { MatchTeam } from '.';
2
+ import { erf } from '../utils';
2
3
  export class MatchRating {
3
4
  constructor({ match, competitionType }) {
4
5
  this.match = match;
5
6
  this.weight = MatchRating.MWF[competitionType];
6
7
  }
7
8
  getPoints(team) {
8
- const rankingValue = MatchRating.SSV[this.match.getScore()] - this.getExpectedResult();
9
- const weighted = rankingValue * this.weight / MatchRating.K;
10
- if (this.match.isWinner(team))
11
- return weighted;
12
- else
13
- return weighted * -1;
9
+ const homeScoreKey = this.match.getScore();
10
+ const emr = this.getExpectedResult();
11
+ const ssv = MatchRating.SSV[homeScoreKey];
12
+ const homeDelta = (ssv - emr) * this.weight / MatchRating.K;
13
+ return team === MatchTeam.HOME ? homeDelta : -homeDelta;
14
14
  }
15
15
  static calculateProbability(z) {
16
- let area = 0.0;
17
- const rectangles = 100000;
18
- const width = (z - (-10)) / rectangles;
19
- for (let i = 0; i < rectangles; i++) {
20
- area += width * Math.exp(-Math.pow((width * i + (-10)), 2) / 2) / Math.sqrt(2 * Math.PI);
21
- }
22
- return area;
16
+ return 0.5 * (1 + erf(z / Math.SQRT2));
23
17
  }
24
18
  getExpectedResult() {
25
19
  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 {
43
37
  }
44
38
  MatchRating.K = 8; // Standard scaling factor
45
39
  MatchRating.SSV = {
46
- [MatchScore['3-0']]: 2,
47
- [MatchScore['3-1']]: 1.5,
48
- [MatchScore['3-2']]: 1,
49
- [MatchScore['2-3']]: -1,
50
- [MatchScore['1-3']]: -1.5,
51
- [MatchScore['0-3']]: -2
40
+ '3-0': 2,
41
+ '3-1': 1.5,
42
+ '3-2': 1,
43
+ '2-3': -1,
44
+ '1-3': -1.5,
45
+ '0-3': -2
52
46
  };
53
47
  MatchRating.C1 = -1.060;
54
48
  MatchRating.C2 = -0.394;
@@ -1 +1,2 @@
1
1
  export declare function clamp(min: number, max: number, value: number): number;
2
+ export declare function erf(x: number): number;
@@ -1,3 +1,20 @@
1
1
  export function clamp(min, max, value) {
2
2
  return Math.max(min, Math.min(value, max));
3
3
  }
4
+ // Approximation of the error function
5
+ export function erf(x) {
6
+ // constants
7
+ const a1 = 0.254829592;
8
+ const a2 = -0.284496736;
9
+ const a3 = 1.421413741;
10
+ const a4 = -1.453152027;
11
+ const a5 = 1.061405429;
12
+ const p = 0.3275911;
13
+ // Save the sign of x
14
+ const sign = x < 0 ? -1 : 1;
15
+ x = Math.abs(x);
16
+ // Abramowitz & Stegun 7.1.26
17
+ const t = 1.0 / (1.0 + p * x);
18
+ const y = 1.0 - ((((a5 * t + a4) * t + a3) * t + a2) * t + a1) * t * Math.exp(-x * x);
19
+ return sign * y;
20
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "volleyballsimtypes",
3
- "version": "0.0.188",
3
+ "version": "0.0.189",
4
4
  "description": "vbsim types",
5
5
  "main": "./dist/cjs/src/index.js",
6
6
  "module": "./dist/esm/src/index.js",