diff --git a/.gitignore b/.gitignore index b37e0d3..abd1137 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ # Test /test/test.py +/test/step6.py # Test output /test/output/* diff --git a/test/scheduleGenerator/generator_v3.py b/test/scheduleGenerator/generator_v3.py index 7fc0092..59e206c 100644 --- a/test/scheduleGenerator/generator_v3.py +++ b/test/scheduleGenerator/generator_v3.py @@ -345,7 +345,7 @@ def generateScheduleV3( with open("./output/timetable.json", "w") as outfile: json.dump(running, outfile, indent=2) - # Step 6 - Evaluate, move students to fix + # Step 6 | Part A - Evaluate, move students to fix conflicts conflicts = [] for student in students: @@ -354,8 +354,13 @@ def generateScheduleV3( # If there is no conflicts: continue if student["classes"] == student["expectedClasses"] and count == student["classes"]: continue + + + + # Step 6 | Part B - Check difference between + # classes vs expectedClasses - + # If difference is too great, attempt to fix # Update Student records with open(studentsDir, "w") as outfile: