tods-competition-factory 1.7.2 → 1.7.4

package/dist/forge/generate.mjs

@@ -1557,6 +1557,7 @@ function getMatchUpFormatAverageTimes({
   });
 }
 
+const DYNAMIC = "DYNAMIC";
 const RANKING = "RANKING";
 const RATING = "RATING";
 const SCALE = "SCALE";
@@ -2962,7 +2963,7 @@ function getRoundMatchUps({
     roundProfile[roundNumber].finishingRound = finishingRoundMap[roundNumber]?.finishingRound;
     roundProfile[roundNumber].roundName = finishingRoundMap[roundNumber]?.roundName;
     roundProfile[roundNumber].abbreviatedRoundName = finishingRoundMap[roundNumber]?.abbreviatedRoundName;
-    roundProfile[roundNumber].finishingPositionRange = roundMatchUps[roundNumber][0].finishingPositionRange;
+    roundProfile[roundNumber].finishingPositionRange = roundMatchUps[roundNumber]?.[0]?.finishingPositionRange;
     if (roundNumber === 1 || !roundProfile[roundNumber - 1]) {
       const orderedDrawPositions = currentRoundDrawPositions.sort(numericSort);
       const pairedDrawPositions = chunkArray(orderedDrawPositions, 2);
@@ -14092,6 +14093,7 @@ function generateCurtisConsolation(params) {
     finishingPositionOffset,
     structureName = MAIN,
     stageSequence = 1,
+    structureNameMap,
     staggeredEntry,
     stage = MAIN,
     matchUpType,
@@ -14125,8 +14127,9 @@ function generateCurtisConsolation(params) {
     const consolationItems = feedRoundOffsets.map((roundOffset, index) => {
       const stageSequence2 = index + 1;
       const { consolationStructure } = consolationFeedStructure({
-        structureId: uuids?.pop(),
         idPrefix: idPrefix && `${idPrefix}-c${index}`,
+        structureId: uuids?.pop(),
+        structureNameMap,
         stageSequence: stageSequence2,
         roundOffset,
         matchUpType,
@@ -14155,9 +14158,9 @@ function generateCurtisConsolation(params) {
         isMock
       });
       const playoffStructure = structureTemplate({
+        structureName: structureNameMap?.[PLAY_OFF] || PLAY_OFF,
         structureId: uuids?.pop(),
         matchUps: playoffMatchUps,
-        structureName: PLAY_OFF,
         stageSequence: 2,
         stage: PLAY_OFF,
         matchUpType
@@ -14182,6 +14185,7 @@ function generateCurtisConsolation(params) {
 }
 function consolationFeedStructure({
   stageSequence = 1,
+  structureNameMap,
   roundOffset = 0,
   matchUpType,
   structureId,
@@ -14202,7 +14206,8 @@ function consolationFeedStructure({
     isMock,
     uuids
   });
-  const structureName = `${CONSOLATION} ${index + 1}`;
+  const defaultName = `${CONSOLATION} ${index + 1}`;
+  const structureName = structureNameMap?.[defaultName] || defaultName;
   const consolationStructure = structureTemplate({
     matchUps: consolationMatchUps,
     stage: CONSOLATION,
@@ -14487,6 +14492,7 @@ function processPlayoffGroups({
     }
     const params = {
       structureId: playoffGroup.structureId ?? uuids?.pop(),
+      structureNameMap: playoffGroup.structureNameMap,
       structureName: playoffGroup.structureName,
       idPrefix: idPrefix && `${idPrefix}-po`,
       appliedPolicies: policyDefinitions,
@@ -19605,98 +19611,6 @@ function generateVoluntaryConsolation(params) {
   return generateVoluntaryConsolation$1({ participants: tournamentParticipants, ...params });
 }
 
-function generateCandidate({
-  maxIterations = 5e3,
-  // cap the processing intensity of the candidate generator
-  valueSortedPairings,
-  // pairings sorted by value from low to high
-  pairingValues,
-  deltaObjects
-}) {
-  const rankedMatchUpValues = Object.assign(
-    {},
-    ...valueSortedPairings.map((rm) => ({ [rm.pairing]: rm.value }))
-  );
-  let candidate = roundCandidate({
-    rankedMatchUpValues,
-    valueSortedPairings,
-    deltaObjects
-  });
-  let deltaCandidate = candidate;
-  const actors = Object.keys(pairingValues);
-  let candidatesCount = 0;
-  let iterations;
-  let opponentCount = actors.length;
-  do {
-    opponentCount -= 1;
-    iterations = actors.length * opponentCount * valueSortedPairings.length / 2;
-  } while (iterations > maxIterations && opponentCount > 2);
-  const stipulatedPairs = [];
-  actors.forEach((actor) => {
-    const participantIdPairings = pairingValues[actor];
-    participantIdPairings.slice(0, opponentCount).forEach((pairing) => {
-      const stipulatedPair = pairingHash(actor, pairing.opponent);
-      if (!stipulatedPairs.includes(stipulatedPair)) {
-        const proposed = roundCandidate({
-          // each roundCandidate starts with stipulated pairings
-          stipulated: [[actor, pairing.opponent]],
-          rankedMatchUpValues,
-          valueSortedPairings,
-          deltaObjects
-        });
-        if (proposed.maxDelta < deltaCandidate.maxDelta)
-          deltaCandidate = proposed;
-        if (proposed.value < candidate.value)
-          candidate = proposed;
-        stipulatedPairs.push(stipulatedPair);
-        candidatesCount += 1;
-      }
-    });
-  });
-  return { candidate, deltaCandidate, candidatesCount, iterations };
-}
-function roundCandidate({
-  rankedMatchUpValues,
-  valueSortedPairings,
-  stipulated = [],
-  deltaObjects
-}) {
-  const roundPlayers = [].concat(...stipulated);
-  const participantIdPairings = [];
-  let candidateValue = 0;
-  stipulated.filter(Boolean).forEach((participantIds) => {
-    const [p1, p2] = participantIds;
-    const pairing = pairingHash(p1, p2);
-    const value = rankedMatchUpValues[pairing];
-    participantIdPairings.push({ participantIds, value });
-    candidateValue += rankedMatchUpValues[pairing];
-  });
-  valueSortedPairings.forEach((rankedPairing) => {
-    const participantIds = rankedPairing.pairing.split("|");
-    const opponentExists = participantIds.reduce(
-      (p, c) => roundPlayers.includes(c) || p,
-      false
-    );
-    if (!opponentExists) {
-      roundPlayers.push(...participantIds);
-      const value = rankedPairing.value;
-      candidateValue += value;
-      participantIdPairings.push({ participantIds, value });
-    }
-  });
-  participantIdPairings.sort((a, b) => a.value - b.value);
-  const maxDelta = participantIdPairings.reduce((p, c) => {
-    const [p1, p2] = c.participantIds;
-    const hash = pairingHash(p1, p2);
-    const delta = deltaObjects[hash];
-    return delta > p ? delta : p;
-  }, 0);
-  return { value: candidateValue, participantIdPairings, maxDelta };
-}
-function pairingHash(id1, id2) {
-  return [id1, id2].sort().join("|");
-}
-
 function generateAdHocMatchUps({
   participantIdPairings,
   addToStructure = true,
@@ -19714,21 +19628,30 @@ function generateAdHocMatchUps({
     structureId = drawDefinition.structures?.[0]?.structureId;
   if (typeof structureId !== "string")
     return { error: MISSING_STRUCTURE_ID };
-  if (newRound && !matchUpsCount) {
+  const structure = drawDefinition.structures?.find(
+    (structure2) => structure2.structureId === structureId
+  );
+  if (!structure)
+    return { error: STRUCTURE_NOT_FOUND };
+  if (!matchUpsCount) {
     const selectedEntries = drawDefinition?.entries?.filter((entry) => {
       const entryStatus = entry.entryStatus;
       return STRUCTURE_SELECTED_STATUSES.includes(entryStatus);
     }) ?? [];
-    matchUpsCount = Math.floor(selectedEntries?.length / 2) || 1;
+    const roundMatchUpsCount = Math.floor(selectedEntries?.length / 2) || 1;
+    if (newRound) {
+      matchUpsCount = roundMatchUpsCount;
+    } else {
+      const maxRemaining = roundMatchUpsCount - (structure.matchUps?.length || 0);
+      if (maxRemaining > 0)
+        matchUpsCount = maxRemaining;
+    }
   }
   if (participantIdPairings && !Array.isArray(participantIdPairings) || matchUpsCount && !isConvertableInteger(matchUpsCount) || matchUpIds && !Array.isArray(matchUpIds) || !participantIdPairings && !matchUpsCount) {
     return { error: INVALID_VALUES, info: "matchUpsCount or pairings error" };
   }
-  const structure = drawDefinition?.structures?.find(
-    (structure2) => structure2.structureId === structureId
-  );
   let structureHasRoundPositions;
-  const existingMatchUps = structure?.matchUps;
+  const existingMatchUps = structure.matchUps ?? [];
   const lastRoundNumber = existingMatchUps?.reduce(
     (roundNumber2, matchUp) => {
       if (matchUp.roundPosition)
@@ -19737,12 +19660,12 @@ function generateAdHocMatchUps({
     },
     0
   );
-  if (structure?.structures || structureHasRoundPositions || structure?.finishingPosition === ROUND_OUTCOME) {
+  if (structure.structures || structureHasRoundPositions || structure.finishingPosition === ROUND_OUTCOME) {
     return { error: INVALID_STRUCTURE };
   }
   if (roundNumber && roundNumber - 1 > (lastRoundNumber || 0))
     return { error: INVALID_VALUES, info: "roundNumber error" };
-  const nextRoundNumber = roundNumber ?? (newRound ? (lastRoundNumber ?? 0) + 1 : lastRoundNumber ?? 1);
+  const nextRoundNumber = roundNumber ?? (newRound && (lastRoundNumber ?? 0) + 1 || lastRoundNumber || 1);
   participantIdPairings = participantIdPairings ?? generateRange(0, matchUpsCount).map(() => ({
     participantIds: [void 0, void 0]
   }));
@@ -19822,9 +19745,311 @@ function addAdHocMatchUps({
   return { ...SUCCESS };
 }
 
-const ENCOUNTER_VALUE = 50;
-const SAME_TEAM_VALUE = 60;
+function generateCandidate({
+  maxIterations = 4e3,
+  // cap the processing intensity of the candidate generator
+  valueSortedPairings,
+  // pairings sorted by value from low to high
+  pairingValues,
+  valueObjects,
+  deltaObjects
+}) {
+  const pairingValueMap = Object.assign(
+    {},
+    ...valueSortedPairings.map((rm) => ({ [rm.pairing]: rm.value }))
+  );
+  const actors = Object.keys(pairingValues);
+  let proposedCandidates = [];
+  const initialProposal = roundCandidate({
+    actorsCount: actors.length,
+    valueSortedPairings,
+    pairingValueMap,
+    deltaObjects,
+    valueObjects
+  });
+  const candidateHashes = [candidateHash(initialProposal)];
+  proposedCandidates.push(initialProposal);
+  let lowCandidateValue = initialProposal.value;
+  let deltaCandidate = initialProposal;
+  let candidatesCount = 0;
+  let iterations = 0;
+  let opponentCount = actors.length;
+  let calculatedIterations;
+  do {
+    opponentCount -= 1;
+    calculatedIterations = actors.length * pairingValues[actors[0]].length;
+  } while (calculatedIterations > maxIterations && opponentCount > 5);
+  const stipulatedPairs = [];
+  actors.forEach((actor) => {
+    const participantIdPairings = pairingValues[actor];
+    participantIdPairings.slice(0, opponentCount).forEach((pairing) => {
+      iterations += 1;
+      const stipulatedPair = pairingHash(actor, pairing.opponent);
+      if (!stipulatedPairs.includes(stipulatedPair)) {
+        const proposed = roundCandidate({
+          // each roundCandidate starts with stipulated pairings
+          stipulated: [[actor, pairing.opponent]],
+          actorsCount: actors.length,
+          valueSortedPairings,
+          pairingValueMap,
+          deltaObjects,
+          valueObjects
+        });
+        if (!candidateHashes.includes(candidateHash(proposed))) {
+          candidateHashes.push(candidateHash(proposed));
+          proposedCandidates.push(proposed);
+          const { maxDelta, value } = proposed;
+          if (maxDelta < deltaCandidate.maxDelta)
+            deltaCandidate = proposed;
+          if (value < lowCandidateValue || value === lowCandidateValue && Math.round(Math.random())) {
+            lowCandidateValue = value;
+          }
+          stipulatedPairs.push(stipulatedPair);
+          candidatesCount += 1;
+        }
+      }
+    });
+    proposedCandidates = proposedCandidates.filter(
+      (proposed) => Math.abs(proposed.value - lowCandidateValue) < 5
+    );
+  });
+  proposedCandidates.sort((a, b) => a.maxDiff - b.maxDiff);
+  const candidate = randomPop(proposedCandidates);
+  return {
+    candidatesCount,
+    deltaCandidate,
+    maxIterations,
+    iterations,
+    candidate
+  };
+}
+function candidateHash(candidate) {
+  return candidate.participantIdPairings.map(({ participantIds }) => participantIds.sort().join("|")).sort().join("/");
+}
+function roundCandidate({
+  valueSortedPairings,
+  stipulated = [],
+  pairingValueMap,
+  deltaObjects,
+  valueObjects,
+  actorsCount
+}) {
+  const roundPlayers = [].concat(...stipulated);
+  const participantIdPairings = [];
+  let candidateValue = 0;
+  stipulated.filter(Boolean).forEach((participantIds) => {
+    const [p1, p2] = participantIds;
+    const pairing = pairingHash(p1, p2);
+    const value = pairingValueMap[pairing];
+    participantIdPairings.push({ participantIds, value });
+    candidateValue += pairingValueMap[pairing];
+  });
+  const consideredPairings = chunkArray(valueSortedPairings, actorsCount).map(
+    (pairings) => shuffleArray(pairings).map((pairing) => ({
+      ...pairing,
+      value: pairing.value + Math.random() * Math.round(Math.random())
+    }))
+  ).flat();
+  consideredPairings.forEach((rankedPairing) => {
+    const participantIds = rankedPairing.pairing.split("|");
+    const opponentExists = participantIds.reduce(
+      (p, c) => roundPlayers.includes(c) || p,
+      false
+    );
+    if (!opponentExists) {
+      roundPlayers.push(...participantIds);
+      const value = rankedPairing.value;
+      candidateValue += value;
+      participantIdPairings.push({ participantIds, value });
+    }
+  });
+  participantIdPairings.sort((a, b) => a.value - b.value);
+  const maxDelta = participantIdPairings.reduce((p, c) => {
+    const [p1, p2] = c.participantIds;
+    const hash = pairingHash(p1, p2);
+    const delta = deltaObjects[hash];
+    return delta > p ? delta : p;
+  }, 0);
+  const maxDiff = participantIdPairings.reduce((p, c) => {
+    const [p1, p2] = c.participantIds;
+    const hash = pairingHash(p1, p2);
+    const diff = valueObjects[hash];
+    return diff > p ? diff : p;
+  }, 0);
+  return { value: candidateValue, participantIdPairings, maxDelta, maxDiff };
+}
+function pairingHash(id1, id2) {
+  return [id1, id2].sort().join("|");
+}
+
+function getPairingsData({ participantIds }) {
+  const possiblePairings = {};
+  const uniquePairings = [];
+  participantIds.forEach((participantId) => {
+    possiblePairings[participantId] = participantIds.filter(
+      (id) => id !== participantId
+    );
+    possiblePairings[participantId].forEach((id) => {
+      const pairing = pairingHash(id, participantId);
+      if (!uniquePairings.includes(pairing))
+        uniquePairings.push(pairing);
+    });
+  });
+  const deltaObjects = Object.assign(
+    {},
+    ...uniquePairings.map((pairing) => ({ [pairing]: 0 }))
+  );
+  return { uniquePairings, possiblePairings, deltaObjects };
+}
+
+function getEncounters({ matchUps }) {
+  const encounters = [];
+  for (const matchUp of matchUps) {
+    const participantIds = matchUp.sides.map(
+      extractAttributes("participantId")
+    );
+    if (participantIds.length === 2) {
+      const [p1, p2] = participantIds;
+      const pairing = pairingHash(p1, p2);
+      if (!encounters.includes(pairing))
+        encounters.push(pairing);
+    }
+  }
+  return { encounters };
+}
+
+function getParticipantPairingValues({
+  possiblePairings,
+  valueObjects
+}) {
+  const pairingValues = {};
+  for (const participantId of Object.keys(possiblePairings)) {
+    const participantValues = possiblePairings[participantId].map(
+      (opponent) => pairingValue(participantId, opponent)
+    );
+    pairingValues[participantId] = participantValues.sort(
+      (a, b) => a.value - b.value
+    );
+  }
+  function pairingValue(participantId, opponent) {
+    const key = pairingHash(participantId, opponent);
+    return { opponent, value: valueObjects[key] };
+  }
+  return { pairingValues };
+}
+
+const ELO = "ELO";
+const NTRP = "NTRP";
+const UTR = "UTR";
+const WTN = "WTN";
+
+const ratingsParameters = {
+  [ELO]: { range: [0, 3e3], decimalsCount: 0, defaultInitialization: 1500 },
+  [NTRP]: {
+    accessors: ["ntrpRating", "dntrpRatingHundredths"],
+    attributes: { ustaRatingType: "" },
+    accessor: "dntrpRatingHundredths",
+    defaultInitialization: 3,
+    decimalsCount: 1,
+    range: [1, 7]
+  },
+  [UTR]: {
+    defaultInitialization: 6,
+    accessors: ["utrRating"],
+    accessor: "utrRating",
+    decimalsCount: 2,
+    range: [1, 16]
+  },
+  [WTN]: {
+    attributes: { confidence: { generator: true, range: [60, 100] } },
+    accessors: ["wtnRating", "confidence"],
+    defaultInitialization: 23,
+    accessor: "wtnRating",
+    decimalsCount: 2,
+    range: [40, 1]
+  }
+};
+
 const DEFAULT_RATING = 0;
+function getSideRatings({
+  tournamentParticipants,
+  adHocRatings,
+  eventType,
+  scaleName,
+  pairing
+}) {
+  const defaultRating = ratingsParameters[scaleName]?.defaultInitialization ?? DEFAULT_RATING;
+  return pairing.split("|").map((participantId) => {
+    if (eventType === DOUBLES) {
+      const individualParticipantIds = tournamentParticipants?.find(
+        (participant) => participant.participantId === participantId
+      )?.individualParticipantIds;
+      return !individualParticipantIds ? defaultRating * 2 : individualParticipantIds?.map(
+        (participantId2) => adHocRatings[participantId2] || defaultRating
+      );
+    } else {
+      return adHocRatings[participantId] || defaultRating;
+    }
+  });
+}
+
+function getPairings({
+  tournamentParticipants,
+  adHocRatings = {},
+  possiblePairings,
+  // participant keyed; provides array of possible opponents
+  uniquePairings,
+  // hashes of all possible participantId pairings
+  maxIterations,
+  deltaObjects,
+  // difference in rating between paired participants
+  valueObjects,
+  // calculated value of a pairing of participants, used for sorting pairings
+  eventType,
+  scaleName,
+  salted
+}) {
+  uniquePairings.forEach((pairing) => {
+    const ratings = getSideRatings({
+      tournamentParticipants,
+      adHocRatings,
+      scaleName,
+      eventType,
+      pairing
+    });
+    const salting = typeof salted === "number" && salted || 0.5;
+    const salt = salted && (Math.round(Math.random()) ? salting : salting * -1) || 0;
+    const ratingsDifference = Math.abs(ratings[0] - ratings[1]) + salt;
+    const pairingDelta = Math.abs(ratings[0] - ratings[1]);
+    deltaObjects[pairing] = pairingDelta;
+    if (!valueObjects[pairing])
+      valueObjects[pairing] = 0;
+    valueObjects[pairing] += ratingsDifference ? Math.pow(ratingsDifference, 2) : 0;
+  });
+  const valueSortedPairings = uniquePairings.map((pairing) => ({ pairing, value: valueObjects[pairing] })).sort((a, b) => a.value - b.value);
+  const { pairingValues } = getParticipantPairingValues({
+    possiblePairings,
+    valueObjects
+  });
+  const { candidate, candidatesCount, deltaCandidate, iterations } = generateCandidate({
+    valueSortedPairings,
+    maxIterations,
+    pairingValues,
+    deltaObjects,
+    valueObjects
+  });
+  const { participantIdPairings } = candidate;
+  return {
+    participantIdPairings,
+    candidatesCount,
+    deltaCandidate,
+    iterations,
+    candidate
+  };
+}
+
+const ENCOUNTER_VALUE = 100;
+const SAME_TEAM_VALUE = 100;
 const MAX_ITERATIONS = 5e3;
 function generateDrawMaticRound({
   maxIterations = MAX_ITERATIONS,
@@ -19836,9 +20061,11 @@ function generateDrawMaticRound({
   drawDefinition,
   adHocRatings,
   structureId,
+  salted = 0.5,
   matchUpIds,
   eventType,
-  structure
+  structure,
+  scaleName
 }) {
   if (!drawDefinition)
     return { error: MISSING_DRAW_DEFINITION };
@@ -19887,7 +20114,9 @@ function generateDrawMaticRound({
     deltaObjects,
     valueObjects,
     eventType,
-    structure
+    scaleName,
+    structure,
+    salted
   };
   const { candidatesCount, participantIdPairings, iterations } = getPairings(params);
   if (!candidatesCount)
@@ -19915,114 +20144,6 @@ function generateDrawMaticRound({
     matchUps
   };
 }
-function getSideRatings({
-  tournamentParticipants,
-  adHocRatings,
-  eventType,
-  pairing
-}) {
-  return pairing.split("|").map((participantId) => {
-    if (eventType === DOUBLES) {
-      const individualParticipantIds = tournamentParticipants?.find(
-        (participant) => participant.participantId === participantId
-      )?.individualParticipantIds;
-      return !individualParticipantIds ? DEFAULT_RATING * 2 : individualParticipantIds?.map(
-        (participantId2) => adHocRatings[participantId2 || DEFAULT_RATING]
-      );
-    } else {
-      return adHocRatings[participantId] || DEFAULT_RATING;
-    }
-  });
-}
-function getPairings({
-  tournamentParticipants,
-  adHocRatings = {},
-  possiblePairings,
-  // participant keyed; provides array of possible opponents
-  uniquePairings,
-  // hashes of all possible participantId pairings
-  maxIterations,
-  deltaObjects,
-  // difference in rating between paired participants
-  valueObjects,
-  // calculated value of a pairing of participants, used for sorting pairings
-  eventType
-}) {
-  uniquePairings.forEach((pairing) => {
-    const ratings = getSideRatings({
-      tournamentParticipants,
-      adHocRatings,
-      eventType,
-      pairing
-    });
-    const ratingsDifference = Math.abs(ratings[0] - ratings[1]) + 1;
-    deltaObjects[pairing] = Math.abs(ratings[0] - ratings[1]);
-    if (!valueObjects[pairing])
-      valueObjects[pairing] = 0;
-    valueObjects[pairing] += Math.pow(ratingsDifference, 2);
-  });
-  const valueSortedPairings = uniquePairings.map((pairing) => ({ pairing, value: valueObjects[pairing] })).sort((a, b) => a.value - b.value);
-  const { pairingValues } = getParticipantPairingValues({
-    possiblePairings,
-    valueObjects
-  });
-  const { candidate, candidatesCount, iterations } = generateCandidate({
-    valueSortedPairings,
-    maxIterations,
-    pairingValues,
-    deltaObjects
-  });
-  const { participantIdPairings } = candidate;
-  return { candidatesCount, participantIdPairings, iterations };
-}
-function getPairingsData({ participantIds }) {
-  const possiblePairings = {};
-  const uniquePairings = [];
-  participantIds.forEach((participantId) => {
-    possiblePairings[participantId] = participantIds.filter(
-      (id) => id !== participantId
-    );
-    possiblePairings[participantId].forEach((id) => {
-      const pairing = pairingHash(id, participantId);
-      if (!uniquePairings.includes(pairing))
-        uniquePairings.push(pairing);
-    });
-  });
-  const deltaObjects = Object.assign(
-    {},
-    ...uniquePairings.map((pairing) => ({ [pairing]: 0 }))
-  );
-  return { uniquePairings, possiblePairings, deltaObjects };
-}
-function getEncounters({ matchUps }) {
-  const encounters = [];
-  for (const matchUp of matchUps) {
-    const participantIds = matchUp.sides.map(getParticipantId);
-    if (participantIds.length === 2) {
-      const [p1, p2] = participantIds;
-      const pairing = pairingHash(p1, p2);
-      if (!encounters.includes(pairing))
-        encounters.push(pairing);
-    }
-  }
-  return { encounters };
-}
-function getParticipantPairingValues({ possiblePairings, valueObjects }) {
-  const pairingValues = {};
-  for (const participantId of Object.keys(possiblePairings)) {
-    const participantValues = possiblePairings[participantId].map(
-      (opponent) => pairingValue(participantId, opponent)
-    );
-    pairingValues[participantId] = participantValues.sort(
-      (a, b) => a.value - b.value
-    );
-  }
-  function pairingValue(participantId, opponent) {
-    const key = pairingHash(participantId, opponent);
-    return { opponent, value: valueObjects[key] };
-  }
-  return { pairingValues };
-}
 
 function generateQualifyingLink({
   targetEntryRound = 1,
@@ -22558,6 +22679,7 @@ function prepareStage(params) {
 function drawMatic({
   tournamentParticipants,
   restrictEntryStatus,
+  adHocRatings = {},
   tournamentRecord,
   generateMatchUps,
   addToStructure,
@@ -22612,12 +22734,16 @@ function drawMatic({
   if (!structureIsAdHoc)
     return { error: INVALID_DRAW_DEFINITION };
   tournamentParticipants = tournamentParticipants ?? tournamentRecord.participants ?? [];
-  const adHocRatings = {};
   for (const participantId of participantIds ?? []) {
     const participant = tournamentParticipants?.find(
       (participant2) => participant2.participantId === participantId
     );
-    let scaleValue = getScaleValue({ eventType, participant });
+    let scaleValue = getScaleValue({
+      scaleName: `${scaleName}.${DYNAMIC}`,
+      scaleAccessor,
+      participant,
+      eventType
+    });
     if (!scaleValue && scaleName) {
       scaleValue = getScaleValue({
         scaleAccessor,
@@ -22626,7 +22752,7 @@ function drawMatic({
         eventType
       });
     }
-    if (scaleValue)
+    if (scaleValue && !adHocRatings[participantId])
       adHocRatings[participantId] = scaleValue;
   }
   return generateDrawMaticRound({
@@ -22644,14 +22770,15 @@ function drawMatic({
   });
 }
 function getScaleValue({
-  eventType = TypeEnum.Singles,
-  scaleName = "dynamic",
+  scaleType = RATING,
   scaleAccessor,
-  participant
+  participant,
+  scaleName,
+  eventType
 }) {
   const scaleAttributes = {
     eventType: eventType || TypeEnum.Singles,
-    scaleType: RATING,
+    scaleType,
     scaleName
   };
   const result = participant && participantScaleItem({