[jboss-svn-commits] JBL Code SVN: r32263 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples: examination/domain and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Mar 28 08:41:43 EDT 2010
Author: ge0ffrey
Date: 2010-03-28 08:41:42 -0400 (Sun, 28 Mar 2010)
New Revision: 32263
Added:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/EmployeeAssignment.java
Removed:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/NurseAssignment.java
Modified:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/CurriculumCourseSchedule.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Examination.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/domain/LessonSchedule.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/domain/Manners2009.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/domain/NQueens.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/NurseRoster.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/domain/PatientAdmissionSchedule.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/domain/TravelingTournament.java
Log:
nurse rostering domain: rename nurseAssigment to employeeAssignment
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/CurriculumCourseSchedule.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/CurriculumCourseSchedule.java 2010-03-28 12:37:40 UTC (rev 32262)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/CurriculumCourseSchedule.java 2010-03-28 12:41:42 UTC (rev 32263)
@@ -144,7 +144,7 @@
}
/**
- * Clone will only deep copy the lectureList
+ * Clone will only deep copy the {@link #lectureList}.
*/
public CurriculumCourseSchedule cloneSolution() {
CurriculumCourseSchedule clone = new CurriculumCourseSchedule();
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Examination.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Examination.java 2010-03-28 12:37:40 UTC (rev 32262)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Examination.java 2010-03-28 12:41:42 UTC (rev 32263)
@@ -151,7 +151,7 @@
}
/**
- * Clone will only deep copy the examList
+ * Clone will only deep copy the {@link #examList}.
*/
public Examination cloneSolution() {
Examination clone = new Examination();
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/domain/LessonSchedule.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/domain/LessonSchedule.java 2010-03-28 12:37:40 UTC (rev 32262)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/domain/LessonSchedule.java 2010-03-28 12:41:42 UTC (rev 32263)
@@ -73,7 +73,7 @@
}
/**
- * Clone will only deep copy the lessonList
+ * Clone will only deep copy the {@link #lessonList}.
*/
public LessonSchedule cloneSolution() {
LessonSchedule clone = new LessonSchedule();
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/domain/Manners2009.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/domain/Manners2009.java 2010-03-28 12:37:40 UTC (rev 32262)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/domain/Manners2009.java 2010-03-28 12:41:42 UTC (rev 32263)
@@ -104,7 +104,7 @@
}
/**
- * Clone will only deep copy the seatDesignationList
+ * Clone will only deep copy the {@link #seatDesignationList}.
*/
public Manners2009 cloneSolution() {
Manners2009 clone = new Manners2009();
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/domain/NQueens.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/domain/NQueens.java 2010-03-28 12:37:40 UTC (rev 32262)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/domain/NQueens.java 2010-03-28 12:41:42 UTC (rev 32263)
@@ -56,7 +56,7 @@
}
/**
- * Clone will only deep copy the queenList
+ * Clone will only deep copy the {@link #queenList}.
*/
public NQueens cloneSolution() {
NQueens clone = new NQueens();
Copied: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/EmployeeAssignment.java (from rev 32249, labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/NurseAssignment.java)
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/EmployeeAssignment.java (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/EmployeeAssignment.java 2010-03-28 12:41:42 UTC (rev 32263)
@@ -0,0 +1,93 @@
+package org.drools.planner.examples.nurserostering.domain;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+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.common.domain.AbstractPersistable;
+
+/**
+ * @author Geoffrey De Smet
+ */
+ at XStreamAlias("EmployeeAssignment")
+public class EmployeeAssignment extends AbstractPersistable implements Comparable<EmployeeAssignment> {
+
+ private Shift shift;
+
+ // Changed by moves, between score calculations.
+ private Employee employee;
+
+ public Shift getShift() {
+ return shift;
+ }
+
+ public void setShift(Shift shift) {
+ this.shift = shift;
+ }
+
+ public Employee getEmployee() {
+ return employee;
+ }
+
+ public void setEmployee(Employee employee) {
+ this.employee = employee;
+ }
+
+ public String getLabel() {
+ return shift + "_" + employee;
+ }
+
+ public int compareTo(EmployeeAssignment other) {
+ return new CompareToBuilder()
+ .append(shift, other.shift)
+ .append(employee, other.employee)
+ .toComparison();
+ }
+
+ public EmployeeAssignment clone() {
+ EmployeeAssignment clone = new EmployeeAssignment();
+ clone.id = id;
+ clone.shift = shift;
+ clone.employee = employee;
+ return clone;
+ }
+
+ /**
+ * The normal methods {@link #equals(Object)} and {@link #hashCode()} cannot be used because the rule engine already
+ * requires them (for performance in their original state).
+ * @see #solutionHashCode()
+ */
+ public boolean solutionEquals(Object o) {
+ if (this == o) {
+ return true;
+ } else if (o instanceof EmployeeAssignment) {
+ EmployeeAssignment other = (EmployeeAssignment) o;
+ return new EqualsBuilder()
+ .append(id, other.id)
+ .append(shift, other.shift)
+ .append(employee, other.employee)
+ .isEquals();
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * The normal methods {@link #equals(Object)} and {@link #hashCode()} cannot be used because the rule engine already
+ * requires them (for performance in their original state).
+ * @see #solutionEquals(Object)
+ */
+ public int solutionHashCode() {
+ return new HashCodeBuilder()
+ .append(id)
+ .append(shift)
+ .append(employee)
+ .toHashCode();
+ }
+
+ @Override
+ public String toString() {
+ return shift + "_" + employee;
+ }
+
+}
Deleted: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/NurseAssignment.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/NurseAssignment.java 2010-03-28 12:37:40 UTC (rev 32262)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/NurseAssignment.java 2010-03-28 12:41:42 UTC (rev 32263)
@@ -1,95 +0,0 @@
-package org.drools.planner.examples.nurserostering.domain;
-
-import java.util.List;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-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.common.domain.AbstractPersistable;
-
-/**
- * @author Geoffrey De Smet
- */
- at XStreamAlias("NurseAssignment")
-public class NurseAssignment extends AbstractPersistable implements Comparable<NurseAssignment> {
-
- private Shift shift;
-
- // Changed by moves, between score calculations.
- private Employee employee;
-
- public Shift getShift() {
- return shift;
- }
-
- public void setShift(Shift shift) {
- this.shift = shift;
- }
-
- public Employee getEmployee() {
- return employee;
- }
-
- public void setEmployee(Employee employee) {
- this.employee = employee;
- }
-
- public String getLabel() {
- return shift + "_" + employee;
- }
-
- public int compareTo(NurseAssignment other) {
- return new CompareToBuilder()
- .append(shift, other.shift)
- .append(employee, other.employee)
- .toComparison();
- }
-
- public NurseAssignment clone() {
- NurseAssignment clone = new NurseAssignment();
- clone.id = id;
- clone.shift = shift;
- clone.employee = employee;
- return clone;
- }
-
- /**
- * The normal methods {@link #equals(Object)} and {@link #hashCode()} cannot be used because the rule engine already
- * requires them (for performance in their original state).
- * @see #solutionHashCode()
- */
- public boolean solutionEquals(Object o) {
- if (this == o) {
- return true;
- } else if (o instanceof NurseAssignment) {
- NurseAssignment other = (NurseAssignment) o;
- return new EqualsBuilder()
- .append(id, other.id)
- .append(shift, other.shift)
- .append(employee, other.employee)
- .isEquals();
- } else {
- return false;
- }
- }
-
- /**
- * The normal methods {@link #equals(Object)} and {@link #hashCode()} cannot be used because the rule engine already
- * requires them (for performance in their original state).
- * @see #solutionEquals(Object)
- */
- public int solutionHashCode() {
- return new HashCodeBuilder()
- .append(id)
- .append(shift)
- .append(employee)
- .toHashCode();
- }
-
- @Override
- public String toString() {
- return shift + "_" + employee;
- }
-
-}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/NurseRoster.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/NurseRoster.java 2010-03-28 12:37:40 UTC (rev 32262)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/NurseRoster.java 2010-03-28 12:41:42 UTC (rev 32263)
@@ -34,7 +34,7 @@
private List<ShiftOffRequest> shiftOffRequestList;
private List<ShiftOnRequest> shiftOnRequestList;
- private List<NurseAssignment> nurseAssignmentList;
+ private List<EmployeeAssignment> employeeAssignmentList;
private HardAndSoftScore score;
@@ -150,12 +150,12 @@
this.shiftOnRequestList = shiftOnRequestList;
}
- public List<NurseAssignment> getNurseAssignmentList() {
- return nurseAssignmentList;
+ public List<EmployeeAssignment> getNurseAssignmentList() {
+ return employeeAssignmentList;
}
- public void setNurseAssignmentList(List<NurseAssignment> nurseAssignmentList) {
- this.nurseAssignmentList = nurseAssignmentList;
+ public void setNurseAssignmentList(List<EmployeeAssignment> employeeAssignmentList) {
+ this.employeeAssignmentList = employeeAssignmentList;
}
public HardAndSoftScore getScore() {
@@ -168,7 +168,7 @@
public boolean isInitialized() {
- return (nurseAssignmentList != null);
+ return (employeeAssignmentList != null);
}
public Collection<? extends Object> getFacts() {
@@ -190,13 +190,13 @@
if (isInitialized()) {
- facts.addAll(nurseAssignmentList);
+ facts.addAll(employeeAssignmentList);
}
return facts;
}
/**
- * Clone will only deep copy the nurseAssignmentList
+ * Clone will only deep copy the {@link #employeeAssignmentList}.
*/
public NurseRoster cloneSolution() {
NurseRoster clone = new NurseRoster();
@@ -219,12 +219,12 @@
// deep clone lectures
- List<NurseAssignment> clonedLectureList = new ArrayList<NurseAssignment>(nurseAssignmentList.size());
- for (NurseAssignment nurseAssignment : nurseAssignmentList) {
- NurseAssignment clonedNurseAssignment = nurseAssignment.clone();
- clonedLectureList.add(clonedNurseAssignment);
+ List<EmployeeAssignment> clonedLectureList = new ArrayList<EmployeeAssignment>(employeeAssignmentList.size());
+ for (EmployeeAssignment employeeAssignment : employeeAssignmentList) {
+ EmployeeAssignment clonedEmployeeAssignment = employeeAssignment.clone();
+ clonedLectureList.add(clonedEmployeeAssignment);
}
- clone.nurseAssignmentList = clonedLectureList;
+ clone.employeeAssignmentList = clonedLectureList;
clone.score = score;
return clone;
}
@@ -237,14 +237,14 @@
return false;
} else {
NurseRoster other = (NurseRoster) o;
- if (nurseAssignmentList.size() != other.nurseAssignmentList.size()) {
+ if (employeeAssignmentList.size() != other.employeeAssignmentList.size()) {
return false;
}
- for (Iterator<NurseAssignment> it = nurseAssignmentList.iterator(), otherIt = other.nurseAssignmentList.iterator(); it.hasNext();) {
- NurseAssignment nurseAssignment = it.next();
- NurseAssignment otherNurseAssignment = otherIt.next();
+ for (Iterator<EmployeeAssignment> it = employeeAssignmentList.iterator(), otherIt = other.employeeAssignmentList.iterator(); it.hasNext();) {
+ EmployeeAssignment employeeAssignment = it.next();
+ EmployeeAssignment otherEmployeeAssignment = otherIt.next();
// Notice: we don't use equals()
- if (!nurseAssignment.solutionEquals(otherNurseAssignment)) {
+ if (!employeeAssignment.solutionEquals(otherEmployeeAssignment)) {
return false;
}
}
@@ -254,9 +254,9 @@
public int hashCode() {
HashCodeBuilder hashCodeBuilder = new HashCodeBuilder();
- for (NurseAssignment nurseAssignment : nurseAssignmentList) {
+ for (EmployeeAssignment employeeAssignment : employeeAssignmentList) {
// Notice: we don't use hashCode()
- hashCodeBuilder.append(nurseAssignment.solutionHashCode());
+ hashCodeBuilder.append(employeeAssignment.solutionHashCode());
}
return hashCodeBuilder.toHashCode();
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/domain/PatientAdmissionSchedule.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/domain/PatientAdmissionSchedule.java 2010-03-28 12:37:40 UTC (rev 32262)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/domain/PatientAdmissionSchedule.java 2010-03-28 12:41:42 UTC (rev 32263)
@@ -225,7 +225,7 @@
// }
/**
- * Clone will only deep copy the bedDesignationList
+ * Clone will only deep copy the {@link #bedDesignationList}.
*/
public PatientAdmissionSchedule cloneSolution() {
PatientAdmissionSchedule clone = new PatientAdmissionSchedule();
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/domain/TravelingTournament.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/domain/TravelingTournament.java 2010-03-28 12:37:40 UTC (rev 32262)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/domain/TravelingTournament.java 2010-03-28 12:41:42 UTC (rev 32263)
@@ -69,7 +69,7 @@
}
/**
- * Clone will only deep copy the matchList
+ * Clone will only deep copy the {@link #matchList}.
*/
public TravelingTournament cloneSolution() {
TravelingTournament clone = new TravelingTournament();
More information about the jboss-svn-commits
mailing list