tods-competition-factory 1.7.4 → 1.7.5

package/dist/tods-competition-factory.development.cjs.js

@@ -362,7 +362,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.7.4';
+    return '1.7.5';
 }
 
 /******************************************************************************
@@ -5552,7 +5552,8 @@ function getScaleValues(_a) {
                 var itemType = itemTypes_1_1.value;
                 var scaleItem = latestScaleItem(itemType);
                 if (scaleItem) {
-                    var _d = __read(scaleItem.itemType.split('.'), 4), type = _d[1], format = _d[2], scaleName = _d[3];
+                    var _d = __read(scaleItem.itemType.split('.'), 5), type = _d[1], format = _d[2], scaleName = _d[3], modifier = _d[4];
+                    var namedScale = modifier ? "".concat(scaleName, ".").concat(modifier) : scaleName;
                     var scaleType = (type === SEEDING$1 && 'seedings') ||
                         (type === RANKING$1 && 'rankings') ||
                         'ratings';
@@ -5561,7 +5562,7 @@ function getScaleValues(_a) {
                     scales[scaleType][format].push({
                         scaleValue: scaleItem.itemValue,
                         scaleDate: scaleItem.itemDate,
-                        scaleName: scaleName,
+                        scaleName: namedScale,
                     });
                 }
             }
@@ -42142,10 +42143,7 @@ function treeMatchUps(_a) {
         uuids: uuids,
     }), roundNodes = _b.roundNodes, matchUps = _b.matchUps);
     roundNumber++;
-    roundLimit =
-        roundLimit ||
-            qualifyingRoundNumber ||
-            (qualifyingPositions ? drawSize / 2 / qualifyingPositions : undefined);
+    roundLimit = roundLimit || qualifyingRoundNumber;
     while (roundNodes.length > 1) {
         if (qualifyingPositions && roundNodes.length === qualifyingPositions) {
             roundLimit = roundNumber - 1;
@@ -50848,11 +50846,11 @@ function getPairings(_a) {
 // this should be in policyDefinitions
 var ENCOUNTER_VALUE = 100;
 var SAME_TEAM_VALUE = 100;
-var MAX_ITERATIONS = 5000;
+var MAX_ITERATIONS = 4000;
 function generateDrawMaticRound(_a) {
     var e_1, _b, e_2, _c, e_3, _d;
     var _e, _f;
-    var _g = _a.maxIterations, maxIterations = _g === void 0 ? MAX_ITERATIONS : _g, _h = _a.generateMatchUps, generateMatchUps = _h === void 0 ? true : _h, tournamentParticipants = _a.tournamentParticipants, tournamentRecord = _a.tournamentRecord, participantIds = _a.participantIds, addToStructure = _a.addToStructure, drawDefinition = _a.drawDefinition, adHocRatings = _a.adHocRatings, structureId = _a.structureId, _j = _a.salted, salted = _j === void 0 ? 0.5 : _j, matchUpIds = _a.matchUpIds, eventType = _a.eventType, structure = _a.structure, scaleName = _a.scaleName;
+    var _g = _a.encounterValue, encounterValue = _g === void 0 ? ENCOUNTER_VALUE : _g, _h = _a.sameTeamValue, sameTeamValue = _h === void 0 ? SAME_TEAM_VALUE : _h, _j = _a.maxIterations, maxIterations = _j === void 0 ? MAX_ITERATIONS : _j, _k = _a.generateMatchUps, generateMatchUps = _k === void 0 ? true : _k, tournamentParticipants = _a.tournamentParticipants, tournamentRecord = _a.tournamentRecord, participantIds = _a.participantIds, addToStructure = _a.addToStructure, drawDefinition = _a.drawDefinition, adHocRatings = _a.adHocRatings, structureId = _a.structureId, _l = _a.salted, salted = _l === void 0 ? 0.5 : _l, matchUpIds = _a.matchUpIds, eventType = _a.eventType, structure = _a.structure, scaleName = _a.scaleName;
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
     if (!structure && !structureId)
@@ -50879,7 +50877,7 @@ function generateDrawMaticRound(_a) {
             var pairing = encounters_1_1.value;
             if (!valueObjects[pairing])
                 valueObjects[pairing] = 0;
-            valueObjects[pairing] += ENCOUNTER_VALUE;
+            valueObjects[pairing] += encounterValue;
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -50905,7 +50903,7 @@ function generateDrawMaticRound(_a) {
                         var pairing = uniquePairings_1_1.value;
                         if (!valueObjects[pairing])
                             valueObjects[pairing] = 0;
-                        valueObjects[pairing] += SAME_TEAM_VALUE;
+                        valueObjects[pairing] += sameTeamValue;
                     }
                 }
                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
@@ -50931,9 +50929,9 @@ function generateDrawMaticRound(_a) {
     //  'P-I-0|P-I-2': 0,
     //  'P-I-0|P-I-3': 0
     // }
-    var _k = getPairingsData({
+    var _m = getPairingsData({
         participantIds: participantIds,
-    }), uniquePairings = _k.uniquePairings, possiblePairings = _k.possiblePairings, deltaObjects = _k.deltaObjects;
+    }), uniquePairings = _m.uniquePairings, possiblePairings = _m.possiblePairings, deltaObjects = _m.deltaObjects;
     var params = {
         tournamentParticipants: tournamentParticipants,
         possiblePairings: possiblePairings,
@@ -50949,8 +50947,7 @@ function generateDrawMaticRound(_a) {
         structure: structure,
         salted: salted,
     };
-    var _l = getPairings(params), candidatesCount = _l.candidatesCount, participantIdPairings = _l.participantIdPairings, iterations = _l.iterations;
-    // console.log({ candidatesCount, participantIdPairings, iterations });
+    var _o = getPairings(params), candidatesCount = _o.candidatesCount, participantIdPairings = _o.participantIdPairings, iterations = _o.iterations, candidate = _o.candidate;
     if (!candidatesCount)
         return { error: NO_CANDIDATES };
     var matchUps;
@@ -50968,14 +50965,15 @@ function generateDrawMaticRound(_a) {
             return result;
         matchUps = result.matchUps;
     }
-    return __assign(__assign({}, SUCCESS), { participantIdPairings: participantIdPairings, candidatesCount: candidatesCount, iterations: iterations, matchUps: matchUps });
+    var maxDelta = candidate.maxDelta, maxDiff = candidate.maxDiff;
+    return __assign(__assign({}, SUCCESS), { participantIdPairings: participantIdPairings, candidatesCount: candidatesCount, iterations: iterations, matchUps: matchUps, maxDelta: maxDelta, maxDiff: maxDiff });
 }
 
 function drawMatic$1(_a) {
     var e_1, _b;
     var _c, _d, _e, _f, _g;
-    var tournamentParticipants = _a.tournamentParticipants, restrictEntryStatus = _a.restrictEntryStatus, _h = _a.adHocRatings, adHocRatings = _h === void 0 ? {} : _h, tournamentRecord = _a.tournamentRecord, generateMatchUps = _a.generateMatchUps, addToStructure = _a.addToStructure, participantIds = _a.participantIds, drawDefinition = _a.drawDefinition, scaleAccessor = _a.scaleAccessor, maxIterations = _a.maxIterations, structureId = _a.structureId, matchUpIds = _a.matchUpIds, scaleName = _a.scaleName, // custom rating name to seed dynamic ratings
-    eventType = _a.eventType, event = _a.event;
+    var tournamentParticipants = _a.tournamentParticipants, restrictEntryStatus = _a.restrictEntryStatus, _h = _a.adHocRatings, adHocRatings = _h === void 0 ? {} : _h, generateMatchUps = _a.generateMatchUps, tournamentRecord = _a.tournamentRecord, addToStructure = _a.addToStructure, participantIds = _a.participantIds, encounterValue = _a.encounterValue, sameTeamValue = _a.sameTeamValue, drawDefinition = _a.drawDefinition, scaleAccessor = _a.scaleAccessor, maxIterations = _a.maxIterations, structureId = _a.structureId, matchUpIds = _a.matchUpIds, scaleName = _a.scaleName, // custom rating name to seed dynamic ratings
+    eventType = _a.eventType, salted = _a.salted, event = _a.event;
     if (typeof drawDefinition !== 'object' ||
         (drawDefinition.drawType && drawDefinition.drawType !== AD_HOC)) {
         return { error: INVALID_DRAW_DEFINITION };
@@ -51062,16 +51060,19 @@ function drawMatic$1(_a) {
     // use scaleEngine.generateDynamicRatings(); see dynamicCalculations.test.ts
     return generateDrawMaticRound({
         tournamentParticipants: tournamentParticipants,
-        tournamentRecord: tournamentRecord,
         generateMatchUps: generateMatchUps,
-        participantIds: participantIds,
+        tournamentRecord: tournamentRecord,
         addToStructure: addToStructure,
+        participantIds: participantIds,
+        encounterValue: encounterValue,
+        sameTeamValue: sameTeamValue,
         drawDefinition: drawDefinition,
         maxIterations: maxIterations,
         adHocRatings: adHocRatings,
         matchUpIds: matchUpIds,
         structure: structure,
         eventType: eventType,
+        salted: salted,
     });
 }
 function getScaleValue(_a) {