[jboss-svn-commits] JBL Code SVN: r32395 - 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-04 11:04:41 -0400 (Sun, 04 Apr 2010)
New Revision: 32395

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

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 14:40:00 UTC (rev 32394)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl	2010-04-04 15:04:41 UTC (rev 32395)
@@ -113,7 +113,7 @@
                 $employee, $firstDayIndex, $lastDayIndex));
 end
 
-//// Minimum number of consecutive working days
+// Minimum number of consecutive working days
 //rule "minimumConsecutiveWorkingDays"
 //    when
 //        $contractLine : ContractLine(
@@ -132,7 +132,7 @@
 //        // The last day has no working day after it
 //        EmployeeAssignment(
 //            employee == $employee,
-//            shiftDateDayIndex < ($firstDayIndex + $minimumIndexDiff), // Too few days
+//            shiftDateDayIndex > $firstDayIndex, shiftDateDayIndex < ($firstDayIndex + $minimumIndexDiff), // Too few days
 //            $lastDayIndex : shiftDateDayIndex
 //        );
 //        not EmployeeAssignment(employee == $employee, shiftDateDayIndex == ($lastDayIndex + 1));
@@ -143,7 +143,7 @@
 //        );
 //    then
 //        insertLogical(new IntConstraintOccurrence("minimumConsecutiveWorkingDays", ConstraintType.NEGATIVE_SOFT,
-//                ($minimumIndexDiff - $lastDayIndex + $firstDayIndex) * $contractLine.getMinimumWeight(),
+//                ($firstDayIndex + $minimumIndexDiff - $lastDayIndex) * $contractLine.getMinimumWeight(),
 //                $employee, $firstDayIndex, $lastDayIndex));
 //end