Student Scheduling: MPP

- when using MPP in the mode where initial assignments cannot be changed (Sectioning.KeepInitialAssignments is true) -> when there is an initial assignment, only return the initial assignment in the course request's domain
UniTime · Apr 30, 2020 · 926d487 · 926d487
1 parent 546377f
commit 926d487
Showing 1 changed file with 23 additions and 1 deletion.
diff --git a/src/org/cpsolver/studentsct/model/CourseRequest.java b/src/org/cpsolver/studentsct/model/CourseRequest.java
@@ -212,6 +212,10 @@ protected int getMaxDomainSize() {
     @Override
     public List<Enrollment> computeEnrollments(Assignment<Request, Enrollment> assignment) {
         List<Enrollment> ret = new ArrayList<Enrollment>();
+        if (getInitialAssignment() != null && getModel() != null && ((StudentSectioningModel)getModel()).isMPP() && ((StudentSectioningModel)getModel()).getKeepInitialAssignments()) {
+            ret.add(getInitialAssignment());
+            return ret;
+        }
         int idx = 0;
         for (Course course : iCourses) {
             for (Config config : course.getOffering().getConfigs()) {
@@ -232,6 +236,10 @@ public List<Enrollment> computeEnrollments(Assignment<Request, Enrollment> assig
      */
     public List<Enrollment> computeRandomEnrollments(Assignment<Request, Enrollment> assignment, int limitEachConfig) {
         List<Enrollment> ret = new ArrayList<Enrollment>();
+        if (getInitialAssignment() != null && getModel() != null && ((StudentSectioningModel)getModel()).isMPP() && ((StudentSectioningModel)getModel()).getKeepInitialAssignments()) {
+            ret.add(getInitialAssignment());
+            return ret;
+        }
         int idx = 0;
         for (Course course : iCourses) {
             for (Config config : course.getOffering().getConfigs()) {
@@ -517,6 +525,10 @@ private void computeEnrollments(Assignment<Request, Enrollment> assignment, Coll
      **/
     public List<Enrollment> getAvaiableEnrollments(Assignment<Request, Enrollment> assignment) {
         List<Enrollment> ret = new ArrayList<Enrollment>();
+        if (getInitialAssignment() != null && getModel() != null && ((StudentSectioningModel)getModel()).isMPP() && ((StudentSectioningModel)getModel()).getKeepInitialAssignments()) {
+            ret.add(getInitialAssignment());
+            return ret;
+        }
         int idx = 0;
         for (Course course : iCourses) {
             for (Config config : course.getOffering().getConfigs()) {
@@ -540,6 +552,8 @@ public List<Enrollment> getAvaiableEnrollments(Assignment<Request, Enrollment> a
     public List<Enrollment> getSelectedEnrollments(Assignment<Request, Enrollment> assignment, boolean availableOnly) {
         if (getSelectedChoices().isEmpty())
             return null;
+        if (getInitialAssignment() != null && getModel() != null && ((StudentSectioningModel)getModel()).isMPP() && ((StudentSectioningModel)getModel()).getKeepInitialAssignments())
+            return null;
         List<Enrollment> enrollments = new ArrayList<Enrollment>();
         for (Course course : iCourses) {
             boolean hasChoice = false;
@@ -563,8 +577,11 @@ public List<Enrollment> getSelectedEnrollments(Assignment<Request, Enrollment> a
      */
     public List<Enrollment> getAvaiableEnrollmentsSkipSameTime(Assignment<Request, Enrollment> assignment) {
         List<Enrollment> ret = new ArrayList<Enrollment>();
-        if (getInitialAssignment() != null)
+        if (getInitialAssignment() != null) {
             ret.add(getInitialAssignment());
+            if (getModel() != null && ((StudentSectioningModel)getModel()).isMPP() && ((StudentSectioningModel)getModel()).getKeepInitialAssignments())
+                return ret;
+        }
         int idx = 0;
         for (Course course : iCourses) {
             boolean skipSameTime = true;
@@ -588,6 +605,11 @@ public List<Enrollment> getAvaiableEnrollmentsSkipSameTime(Assignment<Request, E
      */
     public List<Enrollment> getEnrollmentsSkipSameTime(Assignment<Request, Enrollment> assignment) {
         List<Enrollment> ret = new ArrayList<Enrollment>();
+        if (getInitialAssignment() != null) {
+            ret.add(getInitialAssignment());
+            if (getModel() != null && ((StudentSectioningModel)getModel()).isMPP() && ((StudentSectioningModel)getModel()).getKeepInitialAssignments())
+                return ret;
+        }
         int idx = 0;
         for (Course course : iCourses) {
             for (Config config : course.getOffering().getConfigs()) {