[jboss-svn-commits] JBL Code SVN: r32858 - 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-05-13 07:09:59 -0400 (Thu, 13 May 2010)
New Revision: 32858

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

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-05-13 11:09:22 UTC (rev 32857)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl	2010-05-13 11:09:59 UTC (rev 32858)
@@ -208,11 +208,11 @@
 rule "dayOffRequest"
     when
         $dayOffRequest : DayOffRequest($employee : employee, $shiftDate : shiftDate, $weight : weight);
-        exists EmployeeAssignment(employee == $employee, shiftDate == $shiftDate);
+        $employeeAssignment : EmployeeAssignment(employee == $employee, shiftDate == $shiftDate);
     then
         insertLogical(new IntConstraintOccurrence("dayOffRequest", ConstraintType.NEGATIVE_SOFT,
                 $weight,
-                $dayOffRequest));
+                $dayOffRequest, $employeeAssignment));
 end
 rule "dayOnRequest"
     when
@@ -228,11 +228,11 @@
 rule "shiftOffRequest"
     when
         $shiftOffRequest : ShiftOffRequest($employee : employee, $shift : shift, $weight : weight);
-        exists EmployeeAssignment(employee == $employee, shift == $shift);
+        $employeeAssignment : EmployeeAssignment(employee == $employee, shift == $shift);
     then
         insertLogical(new IntConstraintOccurrence("shiftOffRequest", ConstraintType.NEGATIVE_SOFT,
                 $weight,
-                $shiftOffRequest));
+                $shiftOffRequest, $employeeAssignment));
 end
 rule "shiftOnRequest"
     when