tods-competition-factory 1.7.4 → 1.7.6

package/dist/forge/generate.d.ts

@@ -1411,6 +1411,8 @@ type GenerateDrawMaticRoundArgs = {
     salted?: number | boolean;
     participantIds?: string[];
     addToStructure?: boolean;
+    encounterValue?: number;
+    sameTeamValue?: number;
     maxIterations?: number;
     matchUpIds?: string[];
     structure?: Structure;
@@ -1419,12 +1421,14 @@ type GenerateDrawMaticRoundArgs = {
     scaleName?: string;
     drawId?: string;
 };
-declare function generateDrawMaticRound({ maxIterations, generateMatchUps, tournamentParticipants, tournamentRecord, participantIds, addToStructure, drawDefinition, adHocRatings, structureId, salted, matchUpIds, eventType, structure, scaleName, }: GenerateDrawMaticRoundArgs): ResultType | {
+declare function generateDrawMaticRound({ encounterValue, sameTeamValue, maxIterations, generateMatchUps, tournamentParticipants, tournamentRecord, participantIds, addToStructure, drawDefinition, adHocRatings, structureId, salted, matchUpIds, eventType, structure, scaleName, }: GenerateDrawMaticRoundArgs): ResultType | {
     participantIdPairings: string[][];
     candidatesCount: number;
     matchUps: MatchUp[];
     iterations: number;
     success: boolean;
+    maxDelta: number;
+    maxDiff: number;
 };
 
 type DrawMaticArgs = {
@@ -1436,8 +1440,11 @@ type DrawMaticArgs = {
     drawDefinition?: DrawDefinition;
     tournamentRecord: Tournament;
     generateMatchUps?: boolean;
-    addToStructure?: boolean;
+    salted?: number | boolean;
     participantIds?: string[];
+    addToStructure?: boolean;
+    encounterValue?: number;
+    sameTeamValue?: number;
     maxIterations?: number;
     structure?: Structure;
     matchUpIds?: string[];

package/dist/forge/generate.mjs

@@ -1380,7 +1380,7 @@ function gamesPercent(scoreComponents) {
   return Math.round(minGames / maxGames * 100);
 }
 function pctSpread(pcts) {
-  return pcts.map(gamesPercent).sort().map((p) => p.toFixed(2));
+  return pcts.map(gamesPercent).sort().map((p) => parseFloat(p.toFixed(2)));
 }
 
 function findPolicy({
@@ -1415,15 +1415,15 @@ const POLICY_TYPE_DRAWS = "draws";
 const POLICY_COMPETITIVE_BANDS_DEFAULT = {
   [POLICY_TYPE_COMPETITIVE_BANDS]: {
     policyName: "Competitive Bands Default",
-    competitiveProfile: {
+    profileBands: {
       [DECISIVE]: 20,
       [ROUTINE]: 50
     }
   }
 };
 
-function getMatchUpCompetitiveness({
-  competitiveProfile,
+function getMatchUpCompetitiveProfile({
+  profileBands,
   tournamentRecord,
   matchUp
 }) {
@@ -1432,15 +1432,15 @@ function getMatchUpCompetitiveness({
   const { score, winningSide } = matchUp;
   if (!winningSide)
     return { error: INVALID_VALUES };
-  const policy = !competitiveProfile && tournamentRecord && findPolicy({
+  const policy = !profileBands && tournamentRecord && findPolicy({
     policyType: POLICY_TYPE_COMPETITIVE_BANDS,
     tournamentRecord
   }).policy;
-  const bandProfiles = competitiveProfile || policy?.competitiveProfile || POLICY_COMPETITIVE_BANDS_DEFAULT[POLICY_TYPE_COMPETITIVE_BANDS].competitiveProfile;
+  const bandProfiles = profileBands || policy?.profileBands || POLICY_COMPETITIVE_BANDS_DEFAULT[POLICY_TYPE_COMPETITIVE_BANDS].profileBands;
   const scoreComponents = getScoreComponents({ score });
   const spread = pctSpread([scoreComponents]);
   const competitiveness = getBand(spread, bandProfiles);
-  return { ...SUCCESS, competitiveness };
+  return { ...SUCCESS, competitiveness, pctSpread: spread };
 }
 
 function findMatchupFormatAverageTimes(params) {
@@ -1576,14 +1576,15 @@ function getScaleValues({ participant }) {
     for (const itemType of itemTypes) {
       const scaleItem = latestScaleItem(itemType);
       if (scaleItem) {
-        const [, type, format, scaleName] = scaleItem.itemType.split(".");
+        const [, type, format, scaleName, modifier] = scaleItem.itemType.split(".");
+        const namedScale = modifier ? `${scaleName}.${modifier}` : scaleName;
         const scaleType = type === SEEDING && "seedings" || type === RANKING && "rankings" || "ratings";
         if (!scales[scaleType][format])
           scales[scaleType][format] = [];
         scales[scaleType][format].push({
           scaleValue: scaleItem.itemValue,
           scaleDate: scaleItem.itemDate,
-          scaleName
+          scaleName: namedScale
         });
       }
     }
@@ -4653,7 +4654,7 @@ function getAllStructureMatchUps({
       ...collectionDefinition.category
     } : context?.category;
     const processCodes = matchUp.processCodes?.length && matchUp.processCodes || collectionDefinition?.processCodes?.length && collectionDefinition?.processCodes || structure?.processCodes?.length && structure?.processCodes || drawDefinition?.processCodes?.length && drawDefinition?.processCodes || event2?.processCodes?.length && event2?.processCodes || tournamentRecord?.processCodes;
-    const competitiveness = contextProfile?.withCompetitiveness && getMatchUpCompetitiveness({ ...contextContent, matchUp }).competitiveness;
+    const competitiveProfile = contextProfile?.withCompetitiveness && getMatchUpCompetitiveProfile({ ...contextContent, matchUp });
     const finishingPositionRange = matchUp.finishingPositionRange || additionalContext.finishingPositionRange;
     const onlyDefined = (obj) => definedAttributes(obj, void 0, true);
     const matchUpWithContext = {
@@ -4669,7 +4670,7 @@ function getAllStructureMatchUps({
         finishingPositionRange,
         abbreviatedRoundName,
         drawPositionsRange,
-        competitiveness,
+        competitiveProfile,
         structureName,
         stageSequence,
         drawPositions,
@@ -13936,7 +13937,7 @@ function treeMatchUps({
     uuids
   }));
   roundNumber++;
-  roundLimit = roundLimit || qualifyingRoundNumber || (qualifyingPositions ? drawSize / 2 / qualifyingPositions : void 0);
+  roundLimit = roundLimit || qualifyingRoundNumber;
   while (roundNodes.length > 1) {
     if (qualifyingPositions && roundNodes.length === qualifyingPositions) {
       roundLimit = roundNumber - 1;
@@ -19745,6 +19746,10 @@ function addAdHocMatchUps({
   return { ...SUCCESS };
 }
 
+function stringSort(a, b) {
+  return (a || "").localeCompare(b || "");
+}
+
 function generateCandidate({
   maxIterations = 4e3,
   // cap the processing intensity of the candidate generator
@@ -19879,7 +19884,7 @@ function roundCandidate({
   return { value: candidateValue, participantIdPairings, maxDelta, maxDiff };
 }
 function pairingHash(id1, id2) {
-  return [id1, id2].sort().join("|");
+  return [id1, id2].sort(stringSort).join("|");
 }
 
 function getPairingsData({ participantIds }) {
@@ -19944,13 +19949,19 @@ const UTR = "UTR";
 const WTN = "WTN";
 
 const ratingsParameters = {
-  [ELO]: { range: [0, 3e3], decimalsCount: 0, defaultInitialization: 1500 },
+  [ELO]: {
+    defaultInitialization: 1500,
+    decimalsCount: 0,
+    range: [0, 3e3],
+    ascending: true
+  },
   [NTRP]: {
     accessors: ["ntrpRating", "dntrpRatingHundredths"],
     attributes: { ustaRatingType: "" },
     accessor: "dntrpRatingHundredths",
     defaultInitialization: 3,
     decimalsCount: 1,
+    ascending: true,
     range: [1, 7]
   },
   [UTR]: {
@@ -19958,6 +19969,7 @@ const ratingsParameters = {
     accessors: ["utrRating"],
     accessor: "utrRating",
     decimalsCount: 2,
+    ascending: true,
     range: [1, 16]
   },
   [WTN]: {
@@ -19965,6 +19977,7 @@ const ratingsParameters = {
     accessors: ["wtnRating", "confidence"],
     defaultInitialization: 23,
     accessor: "wtnRating",
+    ascending: false,
     decimalsCount: 2,
     range: [40, 1]
   }
@@ -20050,8 +20063,10 @@ function getPairings({
 
 const ENCOUNTER_VALUE = 100;
 const SAME_TEAM_VALUE = 100;
-const MAX_ITERATIONS = 5e3;
+const MAX_ITERATIONS = 4e3;
 function generateDrawMaticRound({
+  encounterValue = ENCOUNTER_VALUE,
+  sameTeamValue = SAME_TEAM_VALUE,
   maxIterations = MAX_ITERATIONS,
   generateMatchUps = true,
   tournamentParticipants,
@@ -20084,7 +20099,7 @@ function generateDrawMaticRound({
   for (const pairing of encounters) {
     if (!valueObjects[pairing])
       valueObjects[pairing] = 0;
-    valueObjects[pairing] += ENCOUNTER_VALUE;
+    valueObjects[pairing] += encounterValue;
   }
   const teamParticipants = tournamentParticipants?.filter(
     ({ participantType }) => participantType === TEAM
@@ -20096,7 +20111,7 @@ function generateDrawMaticRound({
       for (const pairing of uniquePairings2) {
         if (!valueObjects[pairing])
           valueObjects[pairing] = 0;
-        valueObjects[pairing] += SAME_TEAM_VALUE;
+        valueObjects[pairing] += sameTeamValue;
       }
     }
   }
@@ -20118,7 +20133,7 @@ function generateDrawMaticRound({
     structure,
     salted
   };
-  const { candidatesCount, participantIdPairings, iterations } = getPairings(params);
+  const { candidatesCount, participantIdPairings, iterations, candidate } = getPairings(params);
   if (!candidatesCount)
     return { error: NO_CANDIDATES };
   let matchUps;
@@ -20136,12 +20151,15 @@ function generateDrawMaticRound({
       return result;
     matchUps = result.matchUps;
   }
+  const { maxDelta, maxDiff } = candidate;
   return {
     ...SUCCESS,
     participantIdPairings,
     candidatesCount,
     iterations,
-    matchUps
+    matchUps,
+    maxDelta,
+    maxDiff
   };
 }
 
@@ -22680,10 +22698,12 @@ function drawMatic({
   tournamentParticipants,
   restrictEntryStatus,
   adHocRatings = {},
-  tournamentRecord,
   generateMatchUps,
+  tournamentRecord,
   addToStructure,
   participantIds,
+  encounterValue,
+  sameTeamValue,
   drawDefinition,
   scaleAccessor,
   maxIterations,
@@ -22692,6 +22712,7 @@ function drawMatic({
   scaleName,
   // custom rating name to seed dynamic ratings
   eventType,
+  salted,
   event
 }) {
   if (typeof drawDefinition !== "object" || drawDefinition.drawType && drawDefinition.drawType !== AD_HOC) {
@@ -22757,16 +22778,19 @@ function drawMatic({
   }
   return generateDrawMaticRound({
     tournamentParticipants,
-    tournamentRecord,
     generateMatchUps,
-    participantIds,
+    tournamentRecord,
     addToStructure,
+    participantIds,
+    encounterValue,
+    sameTeamValue,
     drawDefinition,
     maxIterations,
     adHocRatings,
     matchUpIds,
     structure,
-    eventType
+    eventType,
+    salted
   });
 }
 function getScaleValue({