tods-competition-factory 1.7.4 → 1.7.5

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

@@ -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
         });
       }
     }
@@ -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;
@@ -20050,8 +20051,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 +20087,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 +20099,7 @@ function generateDrawMaticRound({
       for (const pairing of uniquePairings2) {
         if (!valueObjects[pairing])
           valueObjects[pairing] = 0;
-        valueObjects[pairing] += SAME_TEAM_VALUE;
+        valueObjects[pairing] += sameTeamValue;
       }
     }
   }
@@ -20118,7 +20121,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 +20139,15 @@ function generateDrawMaticRound({
       return result;
     matchUps = result.matchUps;
   }
+  const { maxDelta, maxDiff } = candidate;
   return {
     ...SUCCESS,
     participantIdPairings,
     candidatesCount,
     iterations,
-    matchUps
+    matchUps,
+    maxDelta,
+    maxDiff
   };
 }
 
@@ -22680,10 +22686,12 @@ function drawMatic({
   tournamentParticipants,
   restrictEntryStatus,
   adHocRatings = {},
-  tournamentRecord,
   generateMatchUps,
+  tournamentRecord,
   addToStructure,
   participantIds,
+  encounterValue,
+  sameTeamValue,
   drawDefinition,
   scaleAccessor,
   maxIterations,
@@ -22692,6 +22700,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 +22766,19 @@ function drawMatic({
   }
   return generateDrawMaticRound({
     tournamentParticipants,
-    tournamentRecord,
     generateMatchUps,
-    participantIds,
+    tournamentRecord,
     addToStructure,
+    participantIds,
+    encounterValue,
+    sameTeamValue,
     drawDefinition,
     maxIterations,
     adHocRatings,
     matchUpIds,
     structure,
-    eventType
+    eventType,
+    salted
   });
 }
 function getScaleValue({