Skip to content

Fixed scheduler not providing enough separation between events #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khanhdo05 merged 1 commit into from
May 12, 2025
Merged

Fixed scheduler not providing enough separation between events #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 43 additions & 5 deletions backend/src/utils/Scheduler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,11 @@ export default class Scheduler {
userPreferences: UserPreferences
): SchedulerOutput {
const scheduledEvents: UserEvent[] = [];
const deadlineRemainders = this.calculateDeadlineRemainders(events, deadlines);
// TODO: sort deadlines by priority
let deadlineRemainders = this.calculateDeadlineRemainders(events, deadlines);

// Sort deadlines by due date
deadlineRemainders = deadlineRemainders.sort((a, b) =>
(a.deadline.due_time?.getTime() || -1) - (b.deadline.due_time?.getTime() || -1));

for (const remainder of deadlineRemainders) {
const {deadline, unscheduledMinutes} = remainder;
Expand All @@ -63,7 +66,7 @@ export default class Scheduler {
// Get the next time block
freeBlock = this.nextFreeTimeBlock([...events, ...scheduledEvents], userPreferences, currentSearchedTime);

// when free block not found, find next day
// A. when free block not found, find next day
if (!freeBlock) {
// move current time to start of next day
const workTimeStart = UserPreferenceUtils.minuteNumberToHourAndMinute(userPreferences.startTime);
Expand All @@ -78,7 +81,7 @@ export default class Scheduler {
}
}

// if free block ends after deadline
// B. if free block ends after deadline
if (
freeBlock &&
deadline.due_time != null &&
Expand All @@ -93,6 +96,41 @@ export default class Scheduler {
freeBlock.minutes = Math.floor((deadline.due_time.getTime() - freeBlock.time.getTime()) / 60000);
}
}

const minSeparationMinutes = Math.min(10, userPreferences.workDuration);
const minSeparationMs = minSeparationMinutes * 60000;

// C. if free block is too short, check later.
if (
freeBlock &&
freeBlock.minutes < minSeparationMinutes
) {
currentSearchedTime = new Date(freeBlock.time.getTime() + minSeparationMs);
freeBlock = null; // This free block is invalid
continue;
}

// D. If scheduled event is too close to one that just ended, check later
const justEndedEvents = [...events, ...scheduledEvents].filter(event =>
freeBlock && event.end_time &&
freeBlock.time.getTime() - event.end_time.getTime() < minSeparationMs &&
freeBlock.time.getTime() - event.end_time.getTime() > 0
);
if (
freeBlock &&
justEndedEvents.length > 0
) {
// Calculate gaps between end of previous event(s) and current searched time
const separations = justEndedEvents.map(event =>
currentSearchedTime.getTime() - (event.end_time?.getTime() || currentSearchedTime.getTime() - minSeparationMs)
);
const timeNeededForMinSeparation =
minSeparationMs - Math.min(...separations);
// Add gap needed to separate events
currentSearchedTime = new Date(currentSearchedTime.getTime() + timeNeededForMinSeparation);
freeBlock = null; // This free block is invalid
continue;
}
} while (!freeBlock);

const scheduleMinutes = Math.min(freeBlock.minutes, minutesLeft);
Expand Down Expand Up @@ -224,7 +262,7 @@ export default class Scheduler {
): { time: Date; minutes: number } | null {

const dayEnd = userPreferences.endTime;
const minIncrement = 5;
const minIncrement = 1;

// Start at startSearchTime and continue search until end of day.
// Increment time by minIncrement minutes if time is not free.
Expand Down