[jboss-svn-commits] JBL Code SVN: r32748 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main: resources/org/drools/planner/examples/nurserostering/solver and 1 other directory.

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

Author: ge0ffrey
Date: 2010-05-05 10:06:34 -0400 (Wed, 05 May 2010)
New Revision: 32748

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

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/EmployeeAssignment.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/EmployeeAssignment.java	2010-05-05 13:42:52 UTC (rev 32747)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/EmployeeAssignment.java	2010-05-05 14:06:34 UTC (rev 32748)
@@ -5,6 +5,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.drools.planner.examples.common.domain.AbstractPersistable;
+import org.drools.planner.examples.nurserostering.domain.contract.Contract;
 
 /**
  * @author Geoffrey De Smet
@@ -102,4 +103,8 @@
         return getShift().getShiftDate().getDayIndex();
     }
 
+    public Contract getContract() {
+        return getEmployee().getContract();
+    }
+
 }

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-05 13:42:52 UTC (rev 32747)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl	2010-05-05 14:06:34 UTC (rev 32748)
@@ -247,7 +247,8 @@
 // Alternative skill
 rule "alternativeSkill"
     when
-        $employeeAssignment : EmployeeAssignment($employee : employee, $shiftType : shiftType);
+        BooleanContractLine(contractLineType == ContractLineType.ALTERNATIVE_SKILL_CATEGORY, $contract : contract);
+        $employeeAssignment : EmployeeAssignment(contract == $contract, $employee : employee, $shiftType : shiftType);
         ShiftTypeSkillRequirement(shiftType == $shiftType, $skill : skill);
         not SkillProficiency(employee == $employee, skill == $skill);
     then