volleyballsimtypes 0.0.429 → 0.0.430

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

@@ -17,16 +17,14 @@ export declare class MatchRating {
     static readonly C4: number;
     static readonly C5: number;
     static readonly SSV: SetScoreVariant;
-    static readonly LEAGUE_BASE: number;
-    static readonly TIER_PENALTY: number;
+    static readonly LEAGUE_WEIGHT: number;
+    static readonly NATIONAL_WEIGHT: number;
     static readonly QUALIFIER_WEIGHT: number;
     static readonly TOURNAMENT_WEIGHT: number;
-    static readonly NATIONAL_WEIGHT: number;
     readonly match: Match;
     readonly weight: number;
     static create(input: unknown): MatchRating;
     private constructor();
-    private static leagueWeight;
     private static applyBotPenalty;
     private static computeWeight;
     static calculateProbability(z: number): number;

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

@@ -21,23 +21,16 @@ class MatchRating {
         this.match = match;
         this.weight = MatchRating.computeWeight(context);
     }
-    static leagueWeight(tier) {
-        return Math.max(MatchRating.TIER_PENALTY, MatchRating.LEAGUE_BASE - MatchRating.TIER_PENALTY * tier);
-    }
     static applyBotPenalty(weight, homeIsBot, awayIsBot) {
         const bots = (homeIsBot ? 1 : 0) + (awayIsBot ? 1 : 0);
         return weight * Math.pow(0.5, bots);
     }
     static computeWeight(context) {
         switch (context.kind) {
-            case 'LEAGUE': {
-                const base = MatchRating.leagueWeight(context.tier);
-                return MatchRating.applyBotPenalty(base, context.homeIsBot, context.awayIsBot);
-            }
-            case 'PROMOTION': {
-                const base = (MatchRating.leagueWeight(context.upperTier) + MatchRating.leagueWeight(context.lowerTier)) / 2;
-                return MatchRating.applyBotPenalty(base, context.homeIsBot, context.awayIsBot);
-            }
+            // Promotion plays at the league weight (it is a league-tier playoff).
+            case 'LEAGUE':
+            case 'PROMOTION':
+                return MatchRating.applyBotPenalty(MatchRating.LEAGUE_WEIGHT, context.homeIsBot, context.awayIsBot);
             case 'QUALIFIER':
                 return MatchRating.applyBotPenalty(MatchRating.QUALIFIER_WEIGHT, context.homeIsBot, context.awayIsBot);
             case 'TOURNAMENT':
@@ -89,13 +82,10 @@ MatchRating.SSV = {
     '1-3': -1.5,
     '0-3': -2
 };
-// League weight = LEAGUE_BASE - TIER_PENALTY * tier
-// Tier 1 → 35, Tier 2 → 30, Tier 3 → 25, Tier 4 → 20, ...
-MatchRating.LEAGUE_BASE = 40;
-MatchRating.TIER_PENALTY = 5;
-// Regional qualifier — higher prestige than any league tier
-MatchRating.QUALIFIER_WEIGHT = 45;
-// WCC tournament — top of the hierarchy
-MatchRating.TOURNAMENT_WEIGHT = 55;
-// National cup, between qualifier and tournament prestige
-MatchRating.NATIONAL_WEIGHT = 50;
+// FIVB tournament-importance weight: FIVB's "K" in S_after = S_before + K*(R-E)/8 (note the static `K`
+// below is the formula's /8 divisor, NOT this). One flat value per competition, FIVB-style — no per-tier
+// or per-stage scaling, since the rating-gap expected result already rewards beating stronger teams.
+MatchRating.LEAGUE_WEIGHT = 20;
+MatchRating.NATIONAL_WEIGHT = 30;
+MatchRating.QUALIFIER_WEIGHT = 40;
+MatchRating.TOURNAMENT_WEIGHT = 50; // WCC, top of the hierarchy

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

@@ -37,22 +37,21 @@ const number_utils_1 = require("../utils/number-utils");
         const match = (0, test_helpers_1.makeMatch30)(home, away);
         return match_rating_1.MatchRating.create({ match, context });
     }
-    (0, globals_1.it)('LEAGUE tier 1 → weight = LEAGUE_BASE - TIER_PENALTY * 1 = 35', () => {
-        const mr = makeRating({ kind: 'LEAGUE', tier: 1, homeIsBot: false, awayIsBot: false });
-        (0, globals_1.expect)(mr.weight).toBe(35);
+    (0, globals_1.it)('LEAGUE → flat LEAGUE_WEIGHT (20), independent of tier', () => {
+        (0, globals_1.expect)(makeRating({ kind: 'LEAGUE', tier: 1, homeIsBot: false, awayIsBot: false }).weight).toBe(20);
+        (0, globals_1.expect)(makeRating({ kind: 'LEAGUE', tier: 7, homeIsBot: false, awayIsBot: false }).weight).toBe(20);
     });
-    (0, globals_1.it)('LEAGUE tier 7 → weight is floored at TIER_PENALTY (5)', () => {
-        // 40 - 5*7 = 5 (minimum is TIER_PENALTY itself)
-        const mr = makeRating({ kind: 'LEAGUE', tier: 7, homeIsBot: false, awayIsBot: false });
-        (0, globals_1.expect)(mr.weight).toBe(5);
+    (0, globals_1.it)('NATIONAL → weight = NATIONAL_WEIGHT (30)', () => {
+        const mr = makeRating({ kind: 'NATIONAL', homeIsBot: false, awayIsBot: false });
+        (0, globals_1.expect)(mr.weight).toBe(30);
     });
-    (0, globals_1.it)('QUALIFIER → weight = QUALIFIER_WEIGHT (45)', () => {
+    (0, globals_1.it)('QUALIFIER → weight = QUALIFIER_WEIGHT (40)', () => {
         const mr = makeRating({ kind: 'QUALIFIER', homeIsBot: false, awayIsBot: false });
-        (0, globals_1.expect)(mr.weight).toBe(45);
+        (0, globals_1.expect)(mr.weight).toBe(40);
     });
-    (0, globals_1.it)('TOURNAMENT → weight = TOURNAMENT_WEIGHT (55)', () => {
+    (0, globals_1.it)('TOURNAMENT → weight = TOURNAMENT_WEIGHT (50)', () => {
         const mr = makeRating({ kind: 'TOURNAMENT', homeIsBot: false, awayIsBot: false });
-        (0, globals_1.expect)(mr.weight).toBe(55);
+        (0, globals_1.expect)(mr.weight).toBe(50);
     });
     (0, globals_1.it)('each bot halves the weight', () => {
         const noBots = makeRating({ kind: 'QUALIFIER', homeIsBot: false, awayIsBot: false });
@@ -61,10 +60,9 @@ const number_utils_1 = require("../utils/number-utils");
         (0, globals_1.expect)(oneBot.weight).toBeCloseTo(noBots.weight * 0.5, 10);
         (0, globals_1.expect)(twoBots.weight).toBeCloseTo(noBots.weight * 0.25, 10);
     });
-    (0, globals_1.it)('PROMOTION weight is the average of the two league tier weights', () => {
-        // upperTier=1 (35), lowerTier=2 (30) → avg = 32.5
+    (0, globals_1.it)('PROMOTION → league weight (20)', () => {
         const mr = makeRating({ kind: 'PROMOTION', upperTier: 1, lowerTier: 2, homeIsBot: false, awayIsBot: false });
-        (0, globals_1.expect)(mr.weight).toBeCloseTo(32.5, 5);
+        (0, globals_1.expect)(mr.weight).toBe(20);
     });
 });
 // ─── getExpectedResult ────────────────────────────────────────────────────────

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

@@ -17,16 +17,14 @@ export declare class MatchRating {
     static readonly C4: number;
     static readonly C5: number;
     static readonly SSV: SetScoreVariant;
-    static readonly LEAGUE_BASE: number;
-    static readonly TIER_PENALTY: number;
+    static readonly LEAGUE_WEIGHT: number;
+    static readonly NATIONAL_WEIGHT: number;
     static readonly QUALIFIER_WEIGHT: number;
     static readonly TOURNAMENT_WEIGHT: number;
-    static readonly NATIONAL_WEIGHT: number;
     readonly match: Match;
     readonly weight: number;
     static create(input: unknown): MatchRating;
     private constructor();
-    private static leagueWeight;
     private static applyBotPenalty;
     private static computeWeight;
     static calculateProbability(z: number): number;

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

@@ -18,23 +18,16 @@ export class MatchRating {
         this.match = match;
         this.weight = MatchRating.computeWeight(context);
     }
-    static leagueWeight(tier) {
-        return Math.max(MatchRating.TIER_PENALTY, MatchRating.LEAGUE_BASE - MatchRating.TIER_PENALTY * tier);
-    }
     static applyBotPenalty(weight, homeIsBot, awayIsBot) {
         const bots = (homeIsBot ? 1 : 0) + (awayIsBot ? 1 : 0);
         return weight * Math.pow(0.5, bots);
     }
     static computeWeight(context) {
         switch (context.kind) {
-            case 'LEAGUE': {
-                const base = MatchRating.leagueWeight(context.tier);
-                return MatchRating.applyBotPenalty(base, context.homeIsBot, context.awayIsBot);
-            }
-            case 'PROMOTION': {
-                const base = (MatchRating.leagueWeight(context.upperTier) + MatchRating.leagueWeight(context.lowerTier)) / 2;
-                return MatchRating.applyBotPenalty(base, context.homeIsBot, context.awayIsBot);
-            }
+            // Promotion plays at the league weight (it is a league-tier playoff).
+            case 'LEAGUE':
+            case 'PROMOTION':
+                return MatchRating.applyBotPenalty(MatchRating.LEAGUE_WEIGHT, context.homeIsBot, context.awayIsBot);
             case 'QUALIFIER':
                 return MatchRating.applyBotPenalty(MatchRating.QUALIFIER_WEIGHT, context.homeIsBot, context.awayIsBot);
             case 'TOURNAMENT':
@@ -85,13 +78,10 @@ MatchRating.SSV = {
     '1-3': -1.5,
     '0-3': -2
 };
-// League weight = LEAGUE_BASE - TIER_PENALTY * tier
-// Tier 1 → 35, Tier 2 → 30, Tier 3 → 25, Tier 4 → 20, ...
-MatchRating.LEAGUE_BASE = 40;
-MatchRating.TIER_PENALTY = 5;
-// Regional qualifier — higher prestige than any league tier
-MatchRating.QUALIFIER_WEIGHT = 45;
-// WCC tournament — top of the hierarchy
-MatchRating.TOURNAMENT_WEIGHT = 55;
-// National cup, between qualifier and tournament prestige
-MatchRating.NATIONAL_WEIGHT = 50;
+// FIVB tournament-importance weight: FIVB's "K" in S_after = S_before + K*(R-E)/8 (note the static `K`
+// below is the formula's /8 divisor, NOT this). One flat value per competition, FIVB-style — no per-tier
+// or per-stage scaling, since the rating-gap expected result already rewards beating stronger teams.
+MatchRating.LEAGUE_WEIGHT = 20;
+MatchRating.NATIONAL_WEIGHT = 30;
+MatchRating.QUALIFIER_WEIGHT = 40;
+MatchRating.TOURNAMENT_WEIGHT = 50; // WCC, top of the hierarchy

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

@@ -35,22 +35,21 @@ describe('MatchRating weight computation', () => {
         const match = makeMatch30(home, away);
         return MatchRating.create({ match, context });
     }
-    it('LEAGUE tier 1 → weight = LEAGUE_BASE - TIER_PENALTY * 1 = 35', () => {
-        const mr = makeRating({ kind: 'LEAGUE', tier: 1, homeIsBot: false, awayIsBot: false });
-        expect(mr.weight).toBe(35);
+    it('LEAGUE → flat LEAGUE_WEIGHT (20), independent of tier', () => {
+        expect(makeRating({ kind: 'LEAGUE', tier: 1, homeIsBot: false, awayIsBot: false }).weight).toBe(20);
+        expect(makeRating({ kind: 'LEAGUE', tier: 7, homeIsBot: false, awayIsBot: false }).weight).toBe(20);
     });
-    it('LEAGUE tier 7 → weight is floored at TIER_PENALTY (5)', () => {
-        // 40 - 5*7 = 5 (minimum is TIER_PENALTY itself)
-        const mr = makeRating({ kind: 'LEAGUE', tier: 7, homeIsBot: false, awayIsBot: false });
-        expect(mr.weight).toBe(5);
+    it('NATIONAL → weight = NATIONAL_WEIGHT (30)', () => {
+        const mr = makeRating({ kind: 'NATIONAL', homeIsBot: false, awayIsBot: false });
+        expect(mr.weight).toBe(30);
     });
-    it('QUALIFIER → weight = QUALIFIER_WEIGHT (45)', () => {
+    it('QUALIFIER → weight = QUALIFIER_WEIGHT (40)', () => {
         const mr = makeRating({ kind: 'QUALIFIER', homeIsBot: false, awayIsBot: false });
-        expect(mr.weight).toBe(45);
+        expect(mr.weight).toBe(40);
     });
-    it('TOURNAMENT → weight = TOURNAMENT_WEIGHT (55)', () => {
+    it('TOURNAMENT → weight = TOURNAMENT_WEIGHT (50)', () => {
         const mr = makeRating({ kind: 'TOURNAMENT', homeIsBot: false, awayIsBot: false });
-        expect(mr.weight).toBe(55);
+        expect(mr.weight).toBe(50);
     });
     it('each bot halves the weight', () => {
         const noBots = makeRating({ kind: 'QUALIFIER', homeIsBot: false, awayIsBot: false });
@@ -59,10 +58,9 @@ describe('MatchRating weight computation', () => {
         expect(oneBot.weight).toBeCloseTo(noBots.weight * 0.5, 10);
         expect(twoBots.weight).toBeCloseTo(noBots.weight * 0.25, 10);
     });
-    it('PROMOTION weight is the average of the two league tier weights', () => {
-        // upperTier=1 (35), lowerTier=2 (30) → avg = 32.5
+    it('PROMOTION → league weight (20)', () => {
         const mr = makeRating({ kind: 'PROMOTION', upperTier: 1, lowerTier: 2, homeIsBot: false, awayIsBot: false });
-        expect(mr.weight).toBeCloseTo(32.5, 5);
+        expect(mr.weight).toBe(20);
     });
 });
 // ─── getExpectedResult ────────────────────────────────────────────────────────

package/package.json

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