Batch Student Solver Reports: Critical Time & Availability Conflicts

- added Critical Time Conflicts, Critical Availability Conflicts, and Critical Time & Availability Conflicts reports - only listing course requests that have Important, Vital, Critical, or LC priority - for conflicts, only courses with the same or higher priority are considered
UniTime · Nov 9, 2023 · c98d02e · c98d02e
1 parent b976806
commit c98d02e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/3rd_party/sources/cpsolver-1.4-SNAPSHOT-sources.jar b/3rd_party/sources/cpsolver-1.4-SNAPSHOT-sources.jar
diff --git a/JavaSource/org/unitime/timetable/server/sectioning/SectioningReportTypesBackend.java b/JavaSource/org/unitime/timetable/server/sectioning/SectioningReportTypesBackend.java
@@ -60,6 +60,12 @@ public static enum ReportType {
 		TIME_CONFLICTS("Time Conflicts", SectionConflictTable.class.getName(), "type", "OVERLAPS", "overlapsIncludeAll", "true"),
 		AVAILABLE_CONFLICTS("Availability Conflicts", SectionConflictTable.class.getName(), "type", "UNAVAILABILITIES", "overlapsIncludeAll", "true"),
 		SECTION_CONFLICTS("Time & Availability Conflicts", SectionConflictTable.class.getName(), "type", "OVERLAPS_AND_UNAVAILABILITIES", "overlapsIncludeAll", "true"),
+		CRITICAL_TIME_CONFLICTS("Critical Time Conflicts", SectionConflictTable.class.getName(), "type", "OVERLAPS", "overlapsIncludeAll", "true", "priority",
+				RequestPriority.Critical.name() + "," + RequestPriority.Vital.name() + "," + RequestPriority.Important.name() + "," + RequestPriority.LC.name()),
+		CRITICAL_AVAILABLE_CONFLICTS("Critical Availability Conflicts", SectionConflictTable.class.getName(), "type", "UNAVAILABILITIES", "overlapsIncludeAll", "true", "priority",
+				RequestPriority.Critical.name() + "," + RequestPriority.Vital.name() + "," + RequestPriority.Important.name() + "," + RequestPriority.LC.name()),
+		CRITICAL_SECTION_CONFLICTS("Critical Time & Availability Conflicts", SectionConflictTable.class.getName(), "type", "OVERLAPS_AND_UNAVAILABILITIES", "overlapsIncludeAll", "true", "priority",
+				RequestPriority.Critical.name() + "," + RequestPriority.Vital.name() + "," + RequestPriority.Important.name() + "," + RequestPriority.LC.name()),
 		UNBALANCED_SECTIONS("Unbalanced Classes", UnbalancedSectionsTable.class.getName()),
 		DISTANCE_CONFLICTS("Distance Conflicts", DistanceConflictTable.class.getName()),
 		TIME_OVERLAPS("Time Overlaps", TimeOverlapConflictTable.class.getName()),

diff --git a/WebContent/WEB-INF/lib/cpsolver-1.4-SNAPSHOT.jar b/WebContent/WEB-INF/lib/cpsolver-1.4-SNAPSHOT.jar
diff --git a/WebContent/help/Release-Notes.xml b/WebContent/help/Release-Notes.xml
@@ -49,6 +49,10 @@
 			<description>
 				<line>Added Student Priority and Request Priority column on various reports.</line>
 				<line>Added Not-Assigned LC Course Requests and Not-Assigned Critical Coruse Requests reports.</line>
+				<line>Added Critical Time Conflicts, Critical Availability Conflicts, and Critical Time &amp; Availability Conflicts reports.
+					<line>Only listing course requests that have Important, Vital, Critical, or LC priority.</line>
+					<line>For time conflicts, only courses with the same or higher priority are considered.</line>
+				</line>
 			</description>
 		</item>
 	</category>