TSA/chapter-organizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor team extension logic in MeetingSchedule component for improved scheduling

Browse Source 
This commit introduces a refactor of the ExtendTeamsInSolution method in the Index.razor component to enhance the handling of extended teams within the scheduling solution. The logic now includes extending teams both forward and backward in the time slots, improving the overall scheduling accuracy. Additionally, a TODO comment has been added to indicate the need to move this logic into the Core.Calculation.TeamScheduler for better integration with the constraint programming model. These changes contribute to a more robust and maintainable scheduling system.
This commit is contained in:
James Kolpack
2026-01-13 09:36:46 -05:00
parent 1601610226
commit e2a5767b04
1 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebApp/Components/Features/MeetingSchedule/Index.razor
+37 -22
View File
@@ -377,6 +377,8 @@
_solutionData.ReloadServerData(); _solutionData.ReloadServerData();
} }
// TODO: Move team extension logic into Core.Calculation.TeamScheduler to handle extended teams
// as part of the constraint programming model rather than post-processing
private void ExtendTeamsInSolution(TeamSchedulerSolution solution, IEnumerable<Team> extendedTeams, Student[] allStudents) private void ExtendTeamsInSolution(TeamSchedulerSolution solution, IEnumerable<Team> extendedTeams, Student[] allStudents)
{ {
if (solution.TimeSlots == null || !solution.TimeSlots.Any()) if (solution.TimeSlots == null || !solution.TimeSlots.Any())
@@ -388,7 +390,7 @@
var extendedTeamIds = extendedTeamsList.Select(t => t.Id).ToHashSet(); var extendedTeamIds = extendedTeamsList.Select(t => t.Id).ToHashSet();
// Find which time slot each extended team is in // Find which time slot each extended team is in and extend both forward and backward
for (int slotIndex = 0; slotIndex < solution.TimeSlots.Length; slotIndex++) for (int slotIndex = 0; slotIndex < solution.TimeSlots.Length; slotIndex++)
{ {
var currentSlot = solution.TimeSlots[slotIndex]; var currentSlot = solution.TimeSlots[slotIndex];
@@ -397,34 +399,47 @@
if (!teamsToExtend.Any()) if (!teamsToExtend.Any())
continue; continue;
// Check if there's a next time slot // Extend forward: add to next time slot (if exists)
if (slotIndex + 1 >= solution.TimeSlots.Length) if (slotIndex + 1 < solution.TimeSlots.Length)
{ {
// Cannot extend - this is the last time slot var nextSlot = solution.TimeSlots[slotIndex + 1];
continue; var nextSlotTeamsList = nextSlot.Teams.ToList();
} var nextSlotTeamIds = nextSlotTeamsList.Select(t => t.Id).ToHashSet();
var nextSlot = solution.TimeSlots[slotIndex + 1]; foreach (var team in teamsToExtend)
// Add extended teams to the next time slot
var nextSlotTeamsList = nextSlot.Teams.ToList();
var nextSlotTeamIds = nextSlotTeamsList.Select(t => t.Id).ToHashSet();
foreach (var team in teamsToExtend)
{
if (!nextSlotTeamIds.Contains(team.Id))
{ {
nextSlotTeamsList.Add(team); if (!nextSlotTeamIds.Contains(team.Id))
nextSlotTeamIds.Add(team.Id); {
nextSlotTeamsList.Add(team);
nextSlotTeamIds.Add(team.Id);
}
} }
nextSlot.Teams = nextSlotTeamsList.ToArray();
nextSlot.StudentOverlaps = TeamSchedulerSolution.GetStudentTeamOverlaps(nextSlot.Teams);
nextSlot.UnscheduledStudents = TeamSchedulerSolution.GetStudentsNotInTimSlot(nextSlot.Teams, allStudents);
} }
// Update the next slot with the extended teams // Extend backward: add to previous time slot (if exists)
nextSlot.Teams = nextSlotTeamsList.ToArray(); if (slotIndex > 0)
{
var previousSlot = solution.TimeSlots[slotIndex - 1];
var previousSlotTeamsList = previousSlot.Teams.ToList();
var previousSlotTeamIds = previousSlotTeamsList.Select(t => t.Id).ToHashSet();
// Recalculate overlaps and unscheduled students for the next slot foreach (var team in teamsToExtend)
nextSlot.StudentOverlaps = TeamSchedulerSolution.GetStudentTeamOverlaps(nextSlot.Teams); {
nextSlot.UnscheduledStudents = TeamSchedulerSolution.GetStudentsNotInTimSlot(nextSlot.Teams, allStudents); if (!previousSlotTeamIds.Contains(team.Id))
{
previousSlotTeamsList.Add(team);
previousSlotTeamIds.Add(team.Id);
}
}
previousSlot.Teams = previousSlotTeamsList.ToArray();
previousSlot.StudentOverlaps = TeamSchedulerSolution.GetStudentTeamOverlaps(previousSlot.Teams);
previousSlot.UnscheduledStudents = TeamSchedulerSolution.GetStudentsNotInTimSlot(previousSlot.Teams, allStudents);
}
} }
} }