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

Add a TimeSlot object, refactor

Browse Source
This commit is contained in:
James Kolpack
2025-10-30 09:35:41 -04:00
parent 967aa567e8
commit cf9949876d
6 changed files with 133 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Calculation/TeamScheduleTimeSlot.cs
+16
View File
@@ -0,0 +1,16 @@
using Core.Entities;
namespace Core.Calculation;
public class TeamScheduleTimeSlot
{
public string Name { get; set; }
public Team[] Teams;
public Student[] UnscheduledStudents;
public IEnumerable<Tuple<Student, IEnumerable<Team>>> StudentOverlaps;
public bool StudentHasOverlaps(Student student)
{
return StudentOverlaps.FirstOrDefault(o => o.Item1.Equals(student)) != null;
}
}
Core/Calculation/TeamScheduler.cs
+2 -2
View File
@@ -92,7 +92,7 @@ public class TeamScheduler
var timeSlotTeams = new Team[_timeSlots.Length][];
if (cpSolverStatus is not (CpSolverStatus.Optimal or CpSolverStatus.Feasible))
return new TeamSchedulerSolution(timeSlotTeams, cpSolverStatus.ToString());
return new TeamSchedulerSolution(timeSlotTeams, _studentObjects.ToArray(), cpSolverStatus.ToString());
Debug.WriteLine($"Total cost: {solver.ObjectiveValue}\n");
@@ -102,6 +102,6 @@ public class TeamScheduler
timeSlotTeams[s] = teams;
}
//Debug.WriteLine("No solution found.");
return new TeamSchedulerSolution(timeSlotTeams, cpSolverStatus.ToString());
return new TeamSchedulerSolution(timeSlotTeams, _studentObjects.ToArray(), cpSolverStatus.ToString());
}
}
Core/Calculation/TeamSchedulerSolution.cs
+10 -5
View File
@@ -4,11 +4,18 @@ namespace Core.Calculation;
public class TeamSchedulerSolution(
Team[][] timeSlots,
Student[] students,
string status)
{
public Team[][] TimeSlots { get; set; } = timeSlots;
public string Status { get; set; } = status;
public string Status { get; } = status;
public TeamScheduleTimeSlot[] TimeSlots { get; set; }
= timeSlots.Select( (teams,i) =>
new TeamScheduleTimeSlot{Name = i.ToString(), Teams = teams,
StudentOverlaps = GetStudentTeamOverlaps(teams),
UnscheduledStudents = GetStudentsNotInTimSlot(teams, students)
}
).ToArray();
public static int GetStudentTeamOverlapCount(Team[][] timeSlots)
{
@@ -30,7 +37,6 @@ public class TeamSchedulerSolution(
select Tuple.Create(gs.First(), gs.Key);
}
public static Student[] GetStudentsNotInTimSlot(Team[] timeSlot, Student[] students)
{
var studentsInTimeSlot = timeSlot.SelectMany(ts => ts.Students).Distinct();
@@ -39,12 +45,11 @@ public class TeamSchedulerSolution(
where studentsInTimeSlot.FirstOrDefault(e => e.Equals(allStudent)) == null
select allStudent
).ToArray();
}
public Team[] StudentUnassignedTeams(Student student)
{
var meetingTeams = TimeSlots.SelectMany(t => t);
var meetingTeams = TimeSlots.SelectMany(t => t.Teams);
return
student.Teams.Where(e => !meetingTeams.Contains(e)).ToArray();
}
Core/Calculation/TeamScheduler_DecisionTree.cs
+1 -1
View File
@@ -33,7 +33,7 @@ public class TeamScheduler_DecisionTree
timeSlots[overlaps.First().Item1].Add(team);
}
return new TeamSchedulerSolution(timeSlots.Select(e => e.ToArray()).ToArray(), "Success?");
return new TeamSchedulerSolution(timeSlots.Select(e => e.ToArray()).ToArray(), [], "Success?");
}
//public Team[][] SolveRecursive()
Core/Calculation/UnassignedStudentScheduler.cs
+13 -9
View File
@@ -5,13 +5,17 @@ namespace Core.Calculation;
public class UnassignedStudentScheduler
{
private readonly Student[] _students;
private readonly Team[] _teams;
private readonly Team[] _allTeams;
private readonly IList<Team>[] _timeSlots;
public UnassignedStudentScheduler(Team[] teams, Team[][] timeslots)
public UnassignedStudentScheduler(Team[] allTeams, TeamScheduleTimeSlot[] timeslots)
: this(allTeams, timeslots.Select(e => e.Teams).ToArray())
{ }
public UnassignedStudentScheduler(Team[] allTeams, Team[][] timeslots)
{
_teams = teams;
_students = teams.SelectMany(t => t.Students).Distinct().ToArray();
_allTeams = allTeams;
_students = allTeams.SelectMany(t => t.Students).Distinct().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)
@@ -68,7 +72,7 @@ public class UnassignedStudentScheduler
// find teams where several unassigned students can work together
private IEnumerable<Team> GetAvailableTeams_BiggestGroup(
IEnumerable<Team> scheduledTeams, IEnumerable<Student> assignedStudents) =>
_teams
_allTeams
.Where(t => scheduledTeams.All(st => st.Id != t.Id))
.Select(t => t.CloneWithOmittedStudents(assignedStudents))
.Where(t => t.Students.Count > 1) //|| t.Event.EventFormat is EventFormat.Individual
@@ -79,7 +83,7 @@ public class UnassignedStudentScheduler
// find individual events unassigned students can work on
private IEnumerable<Team> GetAvailableTeams_Individual(
IEnumerable<Team> scheduledTeams, IEnumerable<Student> assignedStudents) =>
_teams
_allTeams
.Where(t => scheduledTeams.All(st => st.Id != t.Id))
.Where(t => t.Event.EventFormat == EventFormat.Individual || t.Students.Count == 1)
.Select(t => t.CloneWithOmittedStudents(assignedStudents))
@@ -88,14 +92,14 @@ public class UnassignedStudentScheduler
// find any unassigned eventDefinition students can work on
private IEnumerable<Team> GetAvailableTeams_AnyNotMeetingAlready(
IEnumerable<Team> scheduledTeams, IEnumerable<Student> assignedStudents) =>
_teams
_allTeams
.Where(t => scheduledTeams.All(st => st.Id != t.Id))
.Select(t => t.CloneWithOmittedStudents(assignedStudents))
.Where(t => t.Students.Count > 0);
private IEnumerable<Team> GetAvailableTeams_Any(
IEnumerable<Team> scheduledTeams, IEnumerable<Student> assignedStudents) =>
_teams
_allTeams
.Select(t => t.CloneWithOmittedStudents(assignedStudents))
.Where(t => t.Students.Count > 0);
@@ -103,7 +107,7 @@ public class UnassignedStudentScheduler
// find teams where several unassigned students can work together
private IEnumerable<Team> GetAvailableTeams_LevelOfEffort(
IEnumerable<Team> scheduledTeams, IEnumerable<Student> assignedStudents) =>
_teams
_allTeams
.Where(t => scheduledTeams.All(st => st.Id != t.Id))
.Select(t => t.CloneWithOmittedStudents(assignedStudents))
.Where(t => t.Students.Count > 1) //|| t.Event.EventFormat is EventFormat.Individual
WebApp/Components/Pages/MeetingSchedulePages/Index.razor
+27 -28
View File
@@ -11,15 +11,17 @@
<MudText Typo="Typo.h3">@Configuration["ChapterSettings:Shortname"] TSA Schedule @Configuration["ChapterSettings:CompetitionYear"]</MudText>
<MudPaper Class="pa-4 mt-5">
@* <MudText>Include: @string.Join(", ", _scheduledTeams) </MudText> *@
<MudGrid>
<MudItem xs="7" sm="8" lg="9">
<MudText Typo="Typo.h4">Time Slots</MudText>
<MudPaper Class="pa-2 ma-2" Elevation="3">
<MudGrid>
<MudItem xs="12" sm="6" lg="4">
<MudNumericField @bind-Value="_parameters.TimeSlots"
Label="Time Slots" Min="1" Max="4"></MudNumericField>
Label="Time Slots" Min="1" Max="4">
</MudNumericField>
</MudItem>
<MudFlexBreak/>
<MudItem xs="12" sm="6" lg="4">
<MudButton Variant="Variant.Outlined" OnClick="() => AddHighLevelOfEffort()" FullWidth="true">Add High Effort</MudButton>
</MudItem>
@@ -46,17 +48,15 @@
</MudItem>
</MudGrid>
<MudTable T="Team[]" ServerData="SolveSchedule" @ref="_solutionData">
</MudPaper>
<MudTable T="TeamScheduleTimeSlot" ServerData="SolveSchedule" @ref="_solutionData">
<HeaderContent>
</HeaderContent>
<RowTemplate>
<MudTd>
@{
var overlaps
= TeamSchedulerSolution.GetStudentTeamOverlaps(context).ToArray();
}
<MudGrid Class="d-flex justify-start align-start">
@foreach (var team in context.OrderBy(e => e.ToString()))
@foreach (var team in context.Teams.OrderBy(e => e.ToString()))
{
var removed = !_scheduledTeams.Contains(team);
<MudItem xs="12">
@@ -66,11 +66,12 @@
OnClick="@(() => ToggleRequiredTeam(team))">
<MudIcon Icon="@Icons.Material.Filled.Clear"
Size="Size.Small"
Class="@(removed ? "" : "d-none")"></MudIcon>
Class="@(removed ? "" : "d-none")">
</MudIcon>
@team -
@foreach (var student in team.Students)
{
var overlap = overlaps.Any(o => o.Item1.Equals(student));
var overlap = context.StudentHasOverlaps(student);
var color = overlap ? Color.Warning : Color.Default;
<MudText
@@ -86,15 +87,11 @@
</MudGrid>
</MudTd>
<MudTd>
@{
var unscheduled = TeamSchedulerSolution.GetStudentsNotInTimSlot(context, _students);
}
@if (unscheduled.Any())
@if (context.UnscheduledStudents.Any())
{
<MudItem>Unscheduled</MudItem>
<MudGrid>
@foreach (var student in unscheduled)
@foreach (var student in context.UnscheduledStudents)
{
<MudItem xs="12" sm="6" lg="3">
<MudText Typo="Typo.body1" HtmlTag="i">@student.FirstName </MudText>&nbsp;
@@ -111,7 +108,8 @@
OnClick="@(() => ToggleRequiredTeam(unassignedTeam))">
<MudIcon Icon="@Icons.Material.Filled.Check"
Size="Size.Small"
Class="@(added ? "" : "d-none")"></MudIcon>
Class="@(added ? "" : "d-none")">
</MudIcon>
@unassignedTeam
</MudLink>
}
@@ -125,6 +123,7 @@
</MudItem>
<MudItem xs="5" sm="4" lg="3">
<MudStack>
<MudText Typo="Typo.h4">Scheduled Teams</MudText>
<MudItem>@string.Join(", ", (_possibleAdditions ?? []).Select(e => e.ToString()))</MudItem>
<MudToggleGroup T="Team"
SelectionMode="SelectionMode.MultiSelection"
@@ -152,7 +151,7 @@
@code {
private Team[]? _teams;
private Student[]? _students;
MudTable<Team[]> _solutionData;
MudTable<TeamScheduleTimeSlot> _solutionData;
private TeamSchedulerSolution _solution;
private TeamSchedulerOptions _parameters;
bool _isSolving;
@@ -209,7 +208,7 @@
{
_parameters =
new TeamSchedulerOptions(
timeSlots: 2,
2,
mustIncludeEvents:
[
// "Medical Technology", "Electrical Applications" , "RegionalTeam",
@@ -253,7 +252,7 @@
.OrderBy(e => e.FirstName).ToArrayAsync();
}
private async Task<TableData<Team[]>> SolveSchedule(TableState arg1, CancellationToken arg2)
private async Task<TableData<TeamScheduleTimeSlot>> SolveSchedule(TableState arg1, CancellationToken arg2)
{
_isSolving = true;
var teamScheduler = new TeamScheduler(_scheduledTeams, _parameters.TimeSlots);
@@ -282,7 +281,7 @@
await InvokeAsync(StateHasChanged); // let the UI know that the solution has been found
_isSolving = false;
return new TableData<Team[]> { Items = _solution.TimeSlots};
return new TableData<TeamScheduleTimeSlot> { Items = _solution.TimeSlots };
}
private void Solve()
@@ -295,9 +294,9 @@
var sb = new StringBuilder();
foreach (var timeslot in _solution.TimeSlots)
{
var overlaps
= TeamSchedulerSolution.GetStudentTeamOverlaps(timeslot).Select(e => e.Item1).ToArray();
foreach (var scheduledTeam in timeslot.OrderBy(e => e.ToString()))
//var overlaps
// = TeamSchedulerSolution.GetStudentTeamOverlaps(timeslot).Select(e => e.Item1).ToArray();
foreach (var scheduledTeam in timeslot.Teams.OrderBy(e => e.ToString()))
{
var t = scheduledTeam.ToString();
var s =
@@ -305,7 +304,7 @@
scheduledTeam.Students
.OrderBy(e => e == scheduledTeam.Captain)
.ThenBy(e => e.FirstName)
.Select(e => e.FirstName + (overlaps.Contains(e) ? "*": "")));
.Select(e => e.FirstName + (timeslot.StudentHasOverlaps(e) ? "*" : "")));
if (scheduledTeam.Event.EventFormat is EventFormat.Individual)
sb.Append(t);
@@ -313,13 +312,12 @@
sb.Append($"{t} - {s}");
sb.Append(Environment.NewLine);
}
var unscheduled = TeamSchedulerSolution.GetStudentsNotInTimSlot(timeslot, _students);
if (unscheduled.Any())
if (timeslot.UnscheduledStudents.Any())
{
sb.Append("--Unscheduled");
sb.Append(Environment.NewLine);
foreach (var student in unscheduled)
foreach (var student in timeslot.UnscheduledStudents)
{
var s = student.FirstName;
var unassignedTeams = _solution.StudentUnassignedTeams(student);
@@ -342,4 +340,5 @@
Console.WriteLine("Cannot write text to clipboard");
}
}
}