[jboss-svn-commits] JBL Code SVN: r32403 - labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver.

[jboss-svn-commits at lists.jboss.org]

Author: ge0ffrey
Date: 2010-04-05 03:39:55 -0400 (Mon, 05 Apr 2010)
New Revision: 32403

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl
Log:
nurse rostering: better move

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl	2010-04-04 16:27:27 UTC (rev 32402)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl	2010-04-05 07:39:55 UTC (rev 32403)
@@ -79,7 +79,7 @@
 // Minimum number of assignments
 // TODO
 
-// Maximum number of consecutive working days
+// Maximum number of consecutive working days // TODO too slow!
 rule "maximumConsecutiveWorkingDays"
     when
         $contractLine : ContractLine(
@@ -104,8 +104,9 @@
         not EmployeeAssignment(employee == $employee, shiftDateDayIndex == ($lastDayIndex + 1));
 
         // There are no free days between the first and last day
-        forall($shiftDate : ShiftDate(dayIndex > $firstDayIndex && < $lastDayIndex)
-            EmployeeAssignment(employee == $employee, shiftDate == $shiftDate)
+        not(
+            $shiftDate : ShiftDate(dayIndex > $firstDayIndex && < $lastDayIndex)
+            and not EmployeeAssignment(employee == $employee, shiftDate == $shiftDate)
         );
     then
         insertLogical(new IntConstraintOccurrence("maximumConsecutiveWorkingDays", ConstraintType.NEGATIVE_SOFT,