improve splitting

inker · Oct 2, 2024 · 84cd21d · 84cd21d
1 parent d349d70
commit 84cd21d
Showing 1 changed file with 66 additions and 3 deletions.
diff --git a/src/engine/dfs/ls/generateSchedule/splitMatchdaysIntoDays.ts b/src/engine/dfs/ls/generateSchedule/splitMatchdaysIntoDays.ts
@@ -1,4 +1,11 @@
-import { countBy, difference, orderBy, shuffle } from 'lodash';
+import {
+  countBy,
+  difference,
+  mapValues,
+  orderBy,
+  shuffle,
+  sumBy,
+} from 'lodash';
 
 import { type UefaCountry } from '#model/types';
 import type Tournament from '#model/Tournament';
@@ -45,6 +52,26 @@ export default ({
     );
     const numGamesPerDay = matchdaySize / days.length;
 
+    const teamsFromCountryByDay = mapValues(numTeamsByCountry, n => {
+      const quotient = Math.floor(n / days.length);
+      const remainder = n % days.length;
+      return remainder === 0
+        ? {
+            maxAllowed: quotient,
+            numMaxes: days.length,
+          }
+        : {
+            maxAllowed: quotient + 1,
+            numMaxes: remainder,
+          };
+    }) as Record<
+      UefaCountry,
+      {
+        maxAllowed: number;
+        numMaxes: number;
+      }
+    >;
+
     let solution;
     for (
       let numEliminatedPairings = 0;
@@ -114,6 +141,40 @@ export default ({
                 return true;
               }
 
+              const firstTeamCountry = teams[firstTeam].country;
+              const teamsFromFirstTeamCountryData =
+                teamsFromCountryByDay[firstTeamCountry];
+              const firstTeamNumTeamsByDay = c.countryTeamsByDay[
+                firstTeamCountry
+              ].with(
+                c.pickedDay,
+                c.countryTeamsByDay[firstTeamCountry][c.pickedDay] + 1,
+              );
+              if (
+                sumBy(firstTeamNumTeamsByDay, n =>
+                  n >= teamsFromFirstTeamCountryData.maxAllowed ? 1 : 0,
+                ) > teamsFromFirstTeamCountryData.numMaxes
+              ) {
+                return true;
+              }
+
+              const secondTeamCountry = teams[secondTeam].country;
+              const teamsFromSecondTeamCountryData =
+                teamsFromCountryByDay[secondTeamCountry];
+              const secondTeamNumTeamsByDay = c.countryTeamsByDay[
+                secondTeamCountry
+              ].with(
+                c.pickedDay,
+                c.countryTeamsByDay[secondTeamCountry][c.pickedDay] + 1,
+              );
+              if (
+                sumBy(secondTeamNumTeamsByDay, n =>
+                  n >= teamsFromSecondTeamCountryData.maxAllowed ? 1 : 0,
+                ) > teamsFromSecondTeamCountryData.numMaxes
+              ) {
+                return true;
+              }
+
               return false;
             },
 
@@ -189,8 +250,10 @@ export default ({
           if (numEliminatedPairings > 0) {
             // eslint-disable-next-line no-console
             console.log(
-              `solution found after eliminating ${numEliminatedPairings} pairings:`,
-              eliminatedTvPairings,
+              `solution found after eliminating ${numEliminatedPairings} pairings in md ${matchdayIndex + 1}:`,
+              eliminatedTvPairings.map(pair =>
+                [teams[pair[0]].name, teams[pair[1]].name].join(' & '),
+              ),
             );
           }
           solution = s;