[jboss-svn-commits] JBL Code SVN: r33195 - 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
jboss-svn-commits at lists.jboss.org
Sun May 30 06:16:20 EDT 2010
Author: ge0ffrey
Date: 2010-05-30 06:16:19 -0400 (Sun, 30 May 2010)
New Revision: 33195
Added:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeFreeSequence.java
Removed:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeFreeDaySequence.java
Modified:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl
Log:
rename to EmployeeFreeSequence
Deleted: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeFreeDaySequence.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeFreeDaySequence.java 2010-05-30 09:24:38 UTC (rev 33194)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeFreeDaySequence.java 2010-05-30 10:16:19 UTC (rev 33195)
@@ -1,89 +0,0 @@
-package org.drools.planner.examples.nurserostering.domain.solver;
-
-import java.io.Serializable;
-
-import org.apache.commons.lang.builder.CompareToBuilder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.drools.planner.examples.nurserostering.domain.Employee;
-
-/**
- * @author Geoffrey De Smet
- */
-public class EmployeeFreeDaySequence implements Comparable<EmployeeFreeDaySequence>, Serializable {
-
- private Employee employee;
- private int firstDayIndex;
- private int lastDayIndex;
-
- public EmployeeFreeDaySequence(Employee employee, int firstDayIndex, int lastDayIndex) {
- this.employee = employee;
- this.firstDayIndex = firstDayIndex;
- this.lastDayIndex = lastDayIndex;
- }
-
- public Employee getEmployee() {
- return employee;
- }
-
- public void setEmployee(Employee employee) {
- this.employee = employee;
- }
-
- public int getFirstDayIndex() {
- return firstDayIndex;
- }
-
- public void setFirstDayIndex(int firstDayIndex) {
- this.firstDayIndex = firstDayIndex;
- }
-
- public int getLastDayIndex() {
- return lastDayIndex;
- }
-
- public void setLastDayIndex(int lastDayIndex) {
- this.lastDayIndex = lastDayIndex;
- }
-
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- } else if (o instanceof EmployeeFreeDaySequence) {
- EmployeeFreeDaySequence other = (EmployeeFreeDaySequence) o;
- return new EqualsBuilder()
- .append(employee, other.employee)
- .append(firstDayIndex, other.firstDayIndex)
- .append(lastDayIndex, other.lastDayIndex)
- .isEquals();
- } else {
- return false;
- }
- }
-
- public int hashCode() {
- return new HashCodeBuilder()
- .append(employee)
- .append(firstDayIndex)
- .append(lastDayIndex)
- .toHashCode();
- }
-
- public int compareTo(EmployeeFreeDaySequence other) {
- return new CompareToBuilder()
- .append(employee, other.employee)
- .append(firstDayIndex, other.firstDayIndex)
- .append(lastDayIndex, other.lastDayIndex)
- .toComparison();
- }
-
- @Override
- public String toString() {
- return employee + " is free between " + firstDayIndex + " - " + lastDayIndex;
- }
-
- public int getDayLength() {
- return lastDayIndex - firstDayIndex + 1;
- }
-
-}
Copied: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeFreeSequence.java (from rev 33127, labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeFreeDaySequence.java)
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeFreeSequence.java (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeFreeSequence.java 2010-05-30 10:16:19 UTC (rev 33195)
@@ -0,0 +1,89 @@
+package org.drools.planner.examples.nurserostering.domain.solver;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang.builder.CompareToBuilder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.drools.planner.examples.nurserostering.domain.Employee;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class EmployeeFreeSequence implements Comparable<EmployeeFreeSequence>, Serializable {
+
+ private Employee employee;
+ private int firstDayIndex;
+ private int lastDayIndex;
+
+ public EmployeeFreeSequence(Employee employee, int firstDayIndex, int lastDayIndex) {
+ this.employee = employee;
+ this.firstDayIndex = firstDayIndex;
+ this.lastDayIndex = lastDayIndex;
+ }
+
+ public Employee getEmployee() {
+ return employee;
+ }
+
+ public void setEmployee(Employee employee) {
+ this.employee = employee;
+ }
+
+ public int getFirstDayIndex() {
+ return firstDayIndex;
+ }
+
+ public void setFirstDayIndex(int firstDayIndex) {
+ this.firstDayIndex = firstDayIndex;
+ }
+
+ public int getLastDayIndex() {
+ return lastDayIndex;
+ }
+
+ public void setLastDayIndex(int lastDayIndex) {
+ this.lastDayIndex = lastDayIndex;
+ }
+
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ } else if (o instanceof EmployeeFreeSequence) {
+ EmployeeFreeSequence other = (EmployeeFreeSequence) o;
+ return new EqualsBuilder()
+ .append(employee, other.employee)
+ .append(firstDayIndex, other.firstDayIndex)
+ .append(lastDayIndex, other.lastDayIndex)
+ .isEquals();
+ } else {
+ return false;
+ }
+ }
+
+ public int hashCode() {
+ return new HashCodeBuilder()
+ .append(employee)
+ .append(firstDayIndex)
+ .append(lastDayIndex)
+ .toHashCode();
+ }
+
+ public int compareTo(EmployeeFreeSequence other) {
+ return new CompareToBuilder()
+ .append(employee, other.employee)
+ .append(firstDayIndex, other.firstDayIndex)
+ .append(lastDayIndex, other.lastDayIndex)
+ .toComparison();
+ }
+
+ @Override
+ public String toString() {
+ return employee + " is free between " + firstDayIndex + " - " + lastDayIndex;
+ }
+
+ public int getDayLength() {
+ return lastDayIndex - firstDayIndex + 1;
+ }
+
+}
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 09:24:38 UTC (rev 33194)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl 2010-05-30 10:16:19 UTC (rev 33195)
@@ -34,7 +34,7 @@
import org.drools.planner.examples.nurserostering.domain.solver.EmployeeConsecutiveAssignmentStart;
import org.drools.planner.examples.nurserostering.domain.solver.EmployeeConsecutiveWeekendAssignmentEnd;
import org.drools.planner.examples.nurserostering.domain.solver.EmployeeConsecutiveWeekendAssignmentStart;
-import org.drools.planner.examples.nurserostering.domain.solver.EmployeeFreeDaySequence;
+import org.drools.planner.examples.nurserostering.domain.solver.EmployeeFreeSequence;
import org.drools.planner.examples.nurserostering.domain.solver.EmployeeWeekendSequence;
import org.drools.planner.examples.nurserostering.domain.solver.EmployeeWorkSequence;
import org.drools.planner.examples.nurserostering.domain.solver.PatternEntryOccurrence;
@@ -213,7 +213,7 @@
end
-rule "insertEmployeeFreeDaySequence"
+rule "insertEmployeeFreeSequence"
salience 1 // Do these rules first (optional, for performance)
when
EmployeeConsecutiveAssignmentEnd(
@@ -233,9 +233,9 @@
shiftDateDayIndex > $firstDayIndexMinusOne && < $lastDayIndexPlusOne
)
then
- insertLogical(new EmployeeFreeDaySequence($employee, $firstDayIndexMinusOne + 1, $lastDayIndexPlusOne - 1));
+ insertLogical(new EmployeeFreeSequence($employee, $firstDayIndexMinusOne + 1, $lastDayIndexPlusOne - 1));
end
-rule "insertFirstEmployeeFreeDaySequence"
+rule "insertFirstEmployeeFreeSequence"
salience 1 // Do these rules first (optional, for performance)
when
EmployeeConsecutiveAssignmentStart(
@@ -250,9 +250,9 @@
)
RosterInfo(firstShiftDateDayIndex < $lastDayIndexPlusOne, $firstDayIndex : firstShiftDateDayIndex)
then
- insertLogical(new EmployeeFreeDaySequence($employee, $firstDayIndex, $lastDayIndexPlusOne - 1));
+ insertLogical(new EmployeeFreeSequence($employee, $firstDayIndex, $lastDayIndexPlusOne - 1));
end
-rule "insertLastEmployeeFreeDaySequence"
+rule "insertLastEmployeeFreeSequence"
salience 1 // Do these rules first (optional, for performance)
when
EmployeeConsecutiveAssignmentEnd(
@@ -267,7 +267,7 @@
)
RosterInfo(lastShiftDateDayIndex > $firstDayIndexMinusOne, $lastDayIndex : lastShiftDateDayIndex)
then
- insertLogical(new EmployeeFreeDaySequence($employee, $firstDayIndexMinusOne + 1, $lastDayIndex));
+ insertLogical(new EmployeeFreeSequence($employee, $firstDayIndexMinusOne + 1, $lastDayIndex));
end
// Minimum number of consecutive free days
@@ -279,7 +279,7 @@
)
$employee : Employee(contract == $contract)
- $employeeFreeDaySequence : EmployeeFreeDaySequence(
+ $employeeFreeSequence : EmployeeFreeSequence(
employee == $employee,
dayLength < $minimumValue,
$dayLength : dayLength
@@ -287,7 +287,7 @@
then
insertLogical(new IntConstraintOccurrence("minimumConsecutiveFreeDays", ConstraintType.NEGATIVE_SOFT,
($minimumValue - $dayLength) * $contractLine.getMinimumWeight(),
- $employeeFreeDaySequence));
+ $employeeFreeSequence));
end
// Maximum number of consecutive free days
@@ -299,7 +299,7 @@
)
$employee : Employee(contract == $contract)
- $employeeFreeDaySequence : EmployeeFreeDaySequence(
+ $employeeFreeSequence : EmployeeFreeSequence(
employee == $employee,
dayLength > $maximumValue,
$dayLength : dayLength
@@ -307,7 +307,7 @@
then
insertLogical(new IntConstraintOccurrence("maximumConsecutiveFreeDays", ConstraintType.NEGATIVE_SOFT,
($dayLength - $maximumValue) * $contractLine.getMaximumWeight(),
- $employeeFreeDaySequence));
+ $employeeFreeSequence));
end
More information about the jboss-svn-commits
mailing list