remove groupSizeHard1_6 - not working

UrszulaNeuman · Jul 14, 2023 · b26cdf4 · b26cdf4
1 parent 60f4a9c
commit b26cdf4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,8 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
-
+.idea/
+.vscode/
 target/
 
 .classpath

diff --git a/src/main/resources/scheduling.drl b/src/main/resources/scheduling.drl
@@ -23,17 +23,6 @@ rule "groupSizeSoft"
     scoreHolder.addSoftConstraintMatch(kcontext, -groupSoft*($total.intValue() * $total.intValue()));
 end
 
-rule "groupSizeHard1_6"
- when
- 		Facility($facility_name : name)
-    	$total : Number(intValue < 1) from accumulate(
-    		$a : Allocation(shift != null, shift.facility.name ==  $facility_name), 
-    		count($a)
-    	)
-    then
-    scoreHolder.addHardConstraintMatch(kcontext, $total.intValue()-1);
-end
-
 rule "groupSizeHard"
     when
     	Allocation($aid : ID, shift != null, $ashiftID : shift.ID, $studentsNumber : shift.getStudentsPerShift())

diff --git a/src/test/java/uk/ac/diamond/ss/PlannerTest.java b/src/test/java/uk/ac/diamond/ss/PlannerTest.java
@@ -100,11 +100,6 @@ public void testSchedule() {
 		// initial weights
 		for (ConstraintMatchTotal constraintMatchTotal : guiScoreDirector
 				.getConstraintMatchTotals()) {
-			if (constraintMatchTotal.getConstraintName().equals(
-					"groupSizeHard1")) {
-				assertEquals(constraintMatchTotal.getWeightTotalAsNumber()
-						.intValue(), -1);
-			}
 			if (constraintMatchTotal.getConstraintName().equals(
 					"preferencesSoft")) {
 				assertEquals(constraintMatchTotal.getWeightTotalAsNumber()
@@ -167,11 +162,6 @@ public void testSchedule() {
 		guiScoreDirector.setWorkingSolution(ps);
 		for (ConstraintMatchTotal constraintMatchTotal : guiScoreDirector
 				.getConstraintMatchTotals()) {
-			if (constraintMatchTotal.getConstraintName().equals(
-					"groupSizeHard1")) {
-				assertEquals(constraintMatchTotal.getWeightTotalAsNumber()
-						.intValue(), 0);
-			}
 			if (constraintMatchTotal.getConstraintName().equals(
 					"preferencesSoft")) {
 				assertEquals(constraintMatchTotal.getWeightTotalAsNumber()