Revert "WIP: implement duplicate schedule checking in schedule genera…

…tor" This reverts commit 12c2cd3.
cornell-dti · Feb 4, 2025 · 6e1a218 · 6e1a218
1 parent 12c2cd3
commit 6e1a218
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 36 deletions.
diff --git a/src/components/ScheduleGenerate/ScheduleGenerateModal.vue b/src/components/ScheduleGenerate/ScheduleGenerateModal.vue
@@ -168,7 +168,7 @@ export default defineComponent({
       );
     },
     generateSchedules() {
-      const outputs: {
+      const output: {
         semester: string;
         schedule: Map<Course, Timeslot[]>;
         fulfilledRequirements: Map<string, Requirement[]>;
@@ -191,31 +191,7 @@ export default defineComponent({
         );
       }
 
-      /** Checks if two `GeneratedScheduleOutput` objects `first` and `second` are equal. Outputs
-       *  are equal if all three of the following conditions are true: outputs are in the same
-       *  semester, they contain the same courses in the same order, and they have the same total credits.
-       */
-      function isEqual(first: GeneratedScheduleOutput, second: GeneratedScheduleOutput) {
-        if (first.totalCredits !== second.totalCredits || first.semester !== second.semester) {
-          return false;
-        }
-
-        const firstScheduleEntries = Array.from(first.schedule.entries());
-        const secondScheduleEntries = Array.from(first.schedule.entries());
-        if (firstScheduleEntries.length !== secondScheduleEntries.length) {
-          return false;
-        }
-        for (let i = 0; i < firstScheduleEntries.length; i += 1) {
-          if (firstScheduleEntries[i][0].code !== secondScheduleEntries[i][0].code) {
-            return false;
-          }
-        }
-
-        return true;
-      }
-
-      const startTime = Date.now();
-      while (outputs.length < 5 && Date.now() - startTime < 1000) {
+      for (let i = 0; i < 5; i += 1) {
         const courses = this.courses.map(
           course =>
             new Course(
@@ -335,11 +311,10 @@ export default defineComponent({
         momentary.fulfilledRequirements = newFullfilledReqs;
         momentary.totalCredits += deltaCredits;
 
-        if (outputs.every(output => !isEqual(output, momentary))) {
-          outputs.push(momentary);
-        }
+        output.push(momentary);
       }
-      this.generatedScheduleOutputs = outputs;
+
+      this.generatedScheduleOutputs = output;
     },
     regenerateSchedule() {
       this.generateSchedules();

diff --git a/src/schedule-generator/algorithm.ts b/src/schedule-generator/algorithm.ts
@@ -29,20 +29,28 @@ export default class ScheduleGenerator {
         let performAdditionFlag = true;
         const onlyCourseRequirement = course.requirements[0].name ?? 'nonsense-requirement';
 
+        // New logic: must be free for *all* time slots.
         if (
           actualFulfilledRequirements.has(onlyCourseRequirement) ||
           fulfilledRequirements.has(course.code) ||
           creditLimit - course.credits < 0
         ) {
           performAdditionFlag = false;
+        } else {
+          for (const timeslot of course.timeslots) {
+            if (ScheduleGenerator.isTimeslotOccupied(schedule, timeslot)) {
+              performAdditionFlag = false;
+            }
+          }
         }
 
-        if (
-          performAdditionFlag &&
-          course.timeslots.some(
-            timeslot => !ScheduleGenerator.isTimeslotOccupied(schedule, timeslot)
-          )
-        ) {
+        course.timeslots.forEach(timeslot => {
+          if (ScheduleGenerator.isTimeslotOccupied(schedule, timeslot)) {
+            performAdditionFlag = false;
+          }
+        });
+
+        if (performAdditionFlag) {
           ScheduleGenerator.addToSchedule(schedule, course, course.timeslots);
           creditLimit -= course.credits;
           totalCredits += course.credits;
@@ -53,6 +61,7 @@ export default class ScheduleGenerator {
         }
       }
     });
+
     return { semester, schedule, fulfilledRequirements, totalCredits };
   }