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

Scheduler refinements

Browse Source
This commit is contained in:
James Kolpack
2025-10-20 12:03:46 -04:00
parent dd8921f6fe
commit c42cc43399
6 changed files with 103 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Calculation/TeamSchedulerSolution.cs
+7
View File
@@ -41,4 +41,11 @@ public class TeamSchedulerSolution(
).ToArray();
}
public Team[] StudentUnassignedTeams(Student student)
{
var meetingTeams = TimeSlots.SelectMany(t => t);
return
student.Teams.Where(e => !meetingTeams.Contains(e)).ToArray();
}
}
Core/Calculation/UnassignedStudentScheduler.cs
+11 -9
View File
@@ -12,7 +12,7 @@ public class UnassignedStudentScheduler
{
_teams = teams;
_students = teams.SelectMany(t => t.Students).Distinct().ToArray();
_timeSlots = timeslots.Select(ts => ts.Select(t => t.Clone()).ToList()).ToArray();
_timeSlots = timeslots.Select(ts => ts.Select(t => t.Clone()).ToList()).ToArray<IList<Team>>();
}
public static IEnumerable<Student> UnassignedStudents(IList<Student> students, IList<Team> timeSlot)
=> students.Where(s => !timeSlot.SelectMany(t => t.Students).Contains(s));
@@ -20,9 +20,9 @@ public class UnassignedStudentScheduler
public static IEnumerable<Student>[] UnassignedStudents(IList<Student> students, IList<Team>[] schedule)
=> schedule.Select(ts => UnassignedStudents(students, ts)).ToArray();
public TeamSchedulerSolution ScheduleStrategy(UnassignedScheduleStrategy scheduleStrategy)
public Team[] ScheduleStrategy(UnassignedScheduleStrategy scheduleStrategy)
{
var ss = scheduleStrategy switch
var assignments = scheduleStrategy switch
{
UnassignedScheduleStrategy.BiggestGroup => ScheduleStrategy(GetAvailableTeams_BiggestGroup),
UnassignedScheduleStrategy.IndividualEvents => ScheduleStrategy(GetAvailableTeams_Individual),
@@ -32,14 +32,15 @@ public class UnassignedStudentScheduler
_ => throw new ArgumentOutOfRangeException(nameof(scheduleStrategy), scheduleStrategy, null)
};
return new TeamSchedulerSolution(ss, "Success?");
return assignments;
}
public Team[][] ScheduleStrategy(Func<IEnumerable<Team>, IEnumerable<Student>, IEnumerable<Team>> availableTeamSelector)
public Team[] ScheduleStrategy(Func<IEnumerable<Team>, IEnumerable<Student>, IEnumerable<Team>> availableTeamSelector)
{
// Find stuff for unassigned students in each timeslot
var scheduledTeams = _timeSlots.SelectMany(list => list).Distinct().ToList();
foreach (var slot in _timeSlots)
var additions = new List<Team>();
foreach (var slot in _timeSlots)
{
var unassigned = UnassignedStudents(_students, slot).ToList();
while (unassigned.Count > 0)
@@ -54,14 +55,15 @@ public class UnassignedStudentScheduler
slot.Add(teamToAdd);
scheduledTeams.Add(teamToAdd);
additions.Add(teamToAdd);
foreach (var student in teamToAdd.Students)
foreach (var student in teamToAdd.Students)
unassigned.Remove(student);
}
}
return _timeSlots.Select(e => e.ToArray()).ToArray();
}
return additions.ToArray();
}
// find teams where several unassigned students can work together
private IEnumerable<Team> GetAvailableTeams_BiggestGroup(
Core/Entities/Team.cs
+3 -2
View File
@@ -4,7 +4,8 @@ namespace Core.Entities;
public class Team
{
public int Id { get; set; }
[Required]
public EventDefinition Event { get; set; }
public List<Student> Students { get; set; } = [];
@@ -47,7 +48,7 @@ public class Team
{
var studentsToOmitList = studentsToOmit.ToList();
var omittedStudents = Students.Where(studentsToOmitList.Contains).ToList();
if (!omittedStudents.Any())
if (omittedStudents.Count == 0)
return new Team{Captain = Captain, Event = Event, Students = Students.ToList(), Identifier = Identifier};
var remainingStudents = Students.Where(s => !studentsToOmitList.Contains(s)).ToList();
Tests/Calculation/TeamSchedulerTest.cs
+2 -2
View File
@@ -48,8 +48,8 @@ public class TeamSchedulerTest
solution = teamScheduler.Solve();
}
solution = new UnassignedStudentScheduler(allTeams, solution.TimeSlots).ScheduleStrategy(UnassignedScheduleStrategy.BiggestGroup);
solution = new UnassignedStudentScheduler(allTeams, solution.TimeSlots).ScheduleStrategy(UnassignedScheduleStrategy.IndividualEvents);
//solution = new UnassignedStudentScheduler(allTeams, solution.TimeSlots).ScheduleStrategy(UnassignedScheduleStrategy.BiggestGroup);
//solution = new UnassignedStudentScheduler(allTeams, solution.TimeSlots).ScheduleStrategy(UnassignedScheduleStrategy.IndividualEvents);
var i = 1;
foreach (var slot in solution.TimeSlots)
WebApp/Components/Pages/MeetingSchedulePages/Index.razor
+70 -34
View File
@@ -10,33 +10,43 @@
<MudPaper Class="pa-4 mt-5">
<MudText>Include: @string.Join(", ", _requiredTeams) </MudText>
@* <MudText>Include: @string.Join(", ", _requiredTeams) </MudText> *@
<MudGrid>
<MudItem Style="width:250px;">
<MudNumericField @bind-Value="_parameters.TimeSlots"
Label="Time Slots" Min="1" Max="4"></MudNumericField>
<MudItem xs="6" lg="3">
<MudStack>
<MudButton OnClick="() => AddHighLevelOfEffort()">Add High Effort</MudButton>
<MudButton OnClick="() => AddRegionals()">Add Regionals</MudButton>
<MudButton OnClick="() => RemoveIndividual()">Remove Individual</MudButton>
<MudButton OnClick="() => RemoveLowLevelOfEffort()">Remove Low Effort</MudButton>
<MudItem>@string.Join(", ", (_possibleAdditions ?? []).Select(e => e.ToString()))</MudItem>
<MudToggleGroup T="Team"
SelectionMode="SelectionMode.MultiSelection"
@bind-Values="_requiredTeams"
Vertical="true" CheckMark>
Vertical="true"
CheckMark>
@foreach (var team in _teams.OrderBy(e => e.Event.Name))
{
<MudToggleItem Value="@team" Text="@team.ToString()" Style="font-size: .6rem;"/>
<MudToggleItem Value="@team" Style="font-size: .75rem;">
<MudTooltip Text="@string.Join(", ", team.Students.Select(s => s.FirstName))">
<div class="d-flex align-center justify-space-between flex-wrap">
<MudText Class="ellipsis">@team.ToString()</MudText>
<EventAttributes EventDefinition="@team.Event"></EventAttributes>
</div>
</MudTooltip>
</MudToggleItem>
}
</MudToggleGroup>
</MudStack>
</MudItem>
@* <TeamSelector Teams="@_teams" SelectedTeams="@_requiredTeams" Label="Required"></TeamSelector> *@
<MudItem xs="12" lg="4">
<MudItem xs="6" lg="9">
<MudText Typo="Typo.h4">Time Slots</MudText>
<MudNumericField @bind-Value="_parameters.TimeSlots"
Label="Time Slots" Min="1" Max="4"></MudNumericField>
<MudButton Class="ma-3" OnClick="Solve" Variant="Variant.Filled" Color="Color.Primary" Disabled="@_isSolving">Solve</MudButton>
<MudTable T="Team[]" ServerData="SolveSchedule" @ref="_solutionData">
<HeaderContent>
@@ -44,6 +54,7 @@
</HeaderContent>
<RowTemplate>
<MudTd>
<MudItem>Time slot: @context</MudItem>
@{
var ol = TeamSchedulerSolution.GetStudentTeamOverlaps(context);
}
@@ -61,14 +72,18 @@
</MudItem>
} *@
@{ var notInTimeSLot = TeamSchedulerSolution.GetStudentsNotInTimSlot(context, _students); }
@if (notInTimeSLot.Any())
@{ var unscheduled = TeamSchedulerSolution.GetStudentsNotInTimSlot(context, _students); }
@if (unscheduled.Any())
{
<MudItem>
<i>
Not scheduled: @string.Join(", ", notInTimeSLot.Select(s => s.FirstName))
</i>
</MudItem>
<MudItem>Unscheduled</MudItem>
foreach (var student in unscheduled)
{
<MudItem>
<i>@student.FirstName</i>
@string.Join(", ", _solution.StudentUnassignedTeams(student).Select(e => e.ToString()))
</MudItem>
}
}
</MudTd>
@@ -76,12 +91,8 @@
</MudTable>
</MudItem>
</MudGrid>
</MudPaper>
@code {
private Team[]? _teams;
private Student[]? _students;
@@ -90,30 +101,44 @@
private TeamSchedulerOptions _parameters;
bool _isSolving = false;
private IEnumerable<Team> _requiredTeams = [];
private Team[]? _possibleAdditions;
//private Team[] _requiredTeams = [];
private void OnSelectedValuesChanged(IEnumerable<Team> obj)
private async Task OnSelectedValuesChanged(IEnumerable<Team> obj)
{
_requiredTeams = obj.ToList();
await _solutionData.ReloadServerData();
}
private void AddRegionals()
private async Task AddRegionals()
{
_requiredTeams
= _teams.Where(e => e.Event.RegionalEvent).Concat(_requiredTeams).Distinct();
}
private void RemoveIndividual()
private async Task AddHighLevelOfEffort()
{
_requiredTeams
= _teams.Where(e => e.Event.LevelOfEffort >= 3).Concat(_requiredTeams).Distinct();
}
private async Task RemoveIndividual()
{
_requiredTeams
= _requiredTeams.Where(t => t.Event.EventFormat != EventFormat.Individual);
}
private async Task RemoveLowLevelOfEffort()
{
_requiredTeams
= _requiredTeams.Where(t => t.Event.LevelOfEffort > 1);
}
protected override async Task OnInitializedAsync()
{
_parameters =
new TeamSchedulerOptions(
timeSlots: 4,
timeSlots: 2,
mustIncludeEvents:
[
// "Medical Technology", "Electrical Applications" , "RegionalTeam",
@@ -140,7 +165,6 @@
]
);
_teams
= await Context.Teams
.Include(e => e.Event)
@@ -160,10 +184,9 @@
private async Task<TableData<Team[]>> SolveSchedule(TableState arg1, CancellationToken arg2)
{
var requiredTeams = _teams;
_isSolving = true;
var teamScheduler = new TeamScheduler(_requiredTeams, _parameters.TimeSlots);
// teamScheduler
// .ScheduleSeparate(
// _teams.First(e => e.Event.Name.Contains("Data Science")),
@@ -172,15 +195,28 @@
_solution = teamScheduler.Solve();
var loe = new UnassignedStudentScheduler(_teams, _solution.TimeSlots).ScheduleStrategy(UnassignedScheduleStrategy.LevelOfEffort);
var biggest = new UnassignedStudentScheduler(_teams, _solution.TimeSlots).ScheduleStrategy(UnassignedScheduleStrategy.BiggestGroup);
var individual = new UnassignedStudentScheduler(_teams, _solution.TimeSlots).ScheduleStrategy(UnassignedScheduleStrategy.IndividualEvents);
var anyNotMeetingAlready = new UnassignedStudentScheduler(_teams, _solution.TimeSlots).ScheduleStrategy(UnassignedScheduleStrategy.AnyNotMeetingAlready);
_possibleAdditions = loe;
if (_possibleAdditions.Length == 0)
_possibleAdditions = biggest;
if (_possibleAdditions.Length == 0)
_possibleAdditions = anyNotMeetingAlready;
if (_possibleAdditions.Length == 0)
_possibleAdditions = individual;
await InvokeAsync(StateHasChanged); // let the UI know that the solution has been found
_isSolving = false;
return new TableData<Team[]> { Items = _solution.TimeSlots};
}
private void Solve()
{
_solutionData.ReloadServerData();
}
}
WebApp/Properties/launchSettings.json
+10
View File
@@ -55,6 +55,16 @@
},
"publishAllPorts": true,
"useSSL": true
},
"Scheduler": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "meeting-schedule",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"dotnetRunMessages": true,
"applicationUrl": "https://localhost:7235;http://localhost:5013"
}
},
"$schema": "http://json.schemastore.org/launchsettings.json",