[jboss-svn-commits] JBL Code SVN: r33198 - 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-30 08:38:19 -0400 (Sun, 30 May 2010)
New Revision: 33198

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl
Log:
fix unwantedPatternShiftTypeXDaysPattern

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-30 12:21:35 UTC (rev 33197)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl	2010-05-30 12:38:19 UTC (rev 33198)
@@ -538,8 +538,9 @@
         )
 
         Assignment(
+            eval($startDayOfWeek == null) || (shiftDateDayOfWeek == $startDayOfWeek),
             eval($dayIndex0ShiftType == null) || (shiftType == $dayIndex0ShiftType),
-            contract == $contract, shiftDateDayOfWeek == $startDayOfWeek,
+            contract == $contract,
             $employee : employee, $firstDayIndex : shiftDateDayIndex
         )
         Assignment(
@@ -565,8 +566,9 @@
         )
 
         Assignment(
+            eval($startDayOfWeek == null) || (shiftDateDayOfWeek == $startDayOfWeek),
             eval($dayIndex0ShiftType == null) || (shiftType == $dayIndex0ShiftType),
-            contract == $contract, shiftDateDayOfWeek == $startDayOfWeek,
+            contract == $contract,
             $employee : employee, $firstDayIndex : shiftDateDayIndex
         )
         Assignment(
@@ -598,8 +600,9 @@
         )
 
         Assignment(
+            eval($startDayOfWeek == null) || (shiftDateDayOfWeek == $startDayOfWeek),
             eval($dayIndex0ShiftType == null) || (shiftType == $dayIndex0ShiftType),
-            contract == $contract, shiftDateDayOfWeek == $startDayOfWeek,
+            contract == $contract,
             $employee : employee, $firstDayIndex : shiftDateDayIndex
         )
         Assignment(