[jboss-svn-commits] JBL Code SVN: r27224 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule: persistence and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jun 28 05:14:32 EDT 2009
Author: ge0ffrey
Date: 2009-06-28 05:14:32 -0400 (Sun, 28 Jun 2009)
New Revision: 27224
Added:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/AdmissionPart.java
Removed:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Admission.java
Modified:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Bed.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/BedDesignation.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Department.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/PatientAdmissionSchedule.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Room.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/persistence/PatientAdmissionScheduleInputConvertor.java
Log:
pas: rename Admission to AdmissionPart
Deleted: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Admission.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Admission.java 2009-06-28 09:08:33 UTC (rev 27223)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Admission.java 2009-06-28 09:14:32 UTC (rev 27224)
@@ -1,61 +0,0 @@
-package org.drools.solver.examples.patientadmissionschedule.domain;
-
-import org.apache.commons.lang.builder.CompareToBuilder;
-import org.drools.solver.examples.common.domain.AbstractPersistable;
-
-/**
- * @author Geoffrey De Smet
- */
-public class Admission extends AbstractPersistable implements Comparable<Admission> {
-
- private Patient patient;
- private Night firstNight;
- private Night lastNight;
- private Specialism specialism;
-
- public Patient getPatient() {
- return patient;
- }
-
- public void setPatient(Patient patient) {
- this.patient = patient;
- }
-
- public Night getFirstNight() {
- return firstNight;
- }
-
- public void setFirstNight(Night firstNight) {
- this.firstNight = firstNight;
- }
-
- public Night getLastNight() {
- return lastNight;
- }
-
- public void setLastNight(Night lastNight) {
- this.lastNight = lastNight;
- }
-
- public Specialism getSpecialism() {
- return specialism;
- }
-
- public void setSpecialism(Specialism specialism) {
- this.specialism = specialism;
- }
-
- public int compareTo(Admission other) {
- return new CompareToBuilder()
- .append(patient, other.patient)
- .append(firstNight, other.firstNight)
- .append(id, other.id)
- .toComparison();
- }
-
- @Override
- public String toString() {
- return patient + "(" + firstNight + "-" + lastNight + ")";
- }
-
-}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/AdmissionPart.java (from rev 27197, labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Admission.java)
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/AdmissionPart.java (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/AdmissionPart.java 2009-06-28 09:14:32 UTC (rev 27224)
@@ -0,0 +1,61 @@
+package org.drools.solver.examples.patientadmissionschedule.domain;
+
+import org.apache.commons.lang.builder.CompareToBuilder;
+import org.drools.solver.examples.common.domain.AbstractPersistable;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class AdmissionPart extends AbstractPersistable implements Comparable<AdmissionPart> {
+
+ private Patient patient;
+ private Night firstNight;
+ private Night lastNight;
+ private Specialism specialism;
+
+ public Patient getPatient() {
+ return patient;
+ }
+
+ public void setPatient(Patient patient) {
+ this.patient = patient;
+ }
+
+ public Night getFirstNight() {
+ return firstNight;
+ }
+
+ public void setFirstNight(Night firstNight) {
+ this.firstNight = firstNight;
+ }
+
+ public Night getLastNight() {
+ return lastNight;
+ }
+
+ public void setLastNight(Night lastNight) {
+ this.lastNight = lastNight;
+ }
+
+ public Specialism getSpecialism() {
+ return specialism;
+ }
+
+ public void setSpecialism(Specialism specialism) {
+ this.specialism = specialism;
+ }
+
+ public int compareTo(AdmissionPart other) {
+ return new CompareToBuilder()
+ .append(patient, other.patient)
+ .append(firstNight, other.firstNight)
+ .append(id, other.id)
+ .toComparison();
+ }
+
+ @Override
+ public String toString() {
+ return patient + "(" + firstNight + "-" + lastNight + ")";
+ }
+
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Bed.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Bed.java 2009-06-28 09:08:33 UTC (rev 27223)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Bed.java 2009-06-28 09:14:32 UTC (rev 27224)
@@ -40,8 +40,8 @@
return room + "_" + indexInRoom;
}
- public boolean allowsAdmission(Admission admission) {
- return room.allowsAdmission(admission);
+ public boolean allowsAdmissionPart(AdmissionPart admissionPart) {
+ return room.allowsAdmissionPart(admissionPart);
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/BedDesignation.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/BedDesignation.java 2009-06-28 09:08:33 UTC (rev 27223)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/BedDesignation.java 2009-06-28 09:14:32 UTC (rev 27224)
@@ -10,15 +10,15 @@
*/
public class BedDesignation extends AbstractPersistable implements Comparable<BedDesignation> {
- private Admission admission;
+ private AdmissionPart admissionPart;
private Bed bed;
- public Admission getAdmission() {
- return admission;
+ public AdmissionPart getAdmissionPart() {
+ return admissionPart;
}
- public void setAdmission(Admission admission) {
- this.admission = admission;
+ public void setAdmissionPart(AdmissionPart admissionPart) {
+ this.admissionPart = admissionPart;
}
public Bed getBed() {
@@ -31,7 +31,7 @@
public int compareTo(BedDesignation other) {
return new CompareToBuilder()
- .append(admission, other.admission)
+ .append(admissionPart, other.admissionPart)
.append(bed, other.bed)
.append(id, other.id)
.toComparison();
@@ -40,7 +40,7 @@
public BedDesignation clone() {
BedDesignation clone = new BedDesignation();
clone.id = id;
- clone.admission = admission;
+ clone.admissionPart = admissionPart;
clone.bed = bed;
return clone;
}
@@ -57,7 +57,7 @@
BedDesignation other = (BedDesignation) o;
return new EqualsBuilder()
.append(id, other.id)
- .append(admission, other.admission)
+ .append(admissionPart, other.admissionPart)
.append(bed, other.bed)
.isEquals();
} else {
@@ -78,7 +78,7 @@
@Override
public String toString() {
- return admission + " @ " + bed;
+ return admissionPart + " @ " + bed;
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Department.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Department.java 2009-06-28 09:08:33 UTC (rev 27223)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Department.java 2009-06-28 09:14:32 UTC (rev 27224)
@@ -47,8 +47,8 @@
return name;
}
- public boolean allowsAdmission(Admission admission) {
- return allowsPatientAge(admission.getPatient());
+ public boolean allowsAdmissionPart(AdmissionPart admissionPart) {
+ return allowsPatientAge(admissionPart.getPatient());
}
public boolean allowsPatientAge(Patient patient) {
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/PatientAdmissionSchedule.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/PatientAdmissionSchedule.java 2009-06-28 09:08:33 UTC (rev 27223)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/PatientAdmissionSchedule.java 2009-06-28 09:14:32 UTC (rev 27224)
@@ -24,7 +24,7 @@
private List<Bed> bedList;
private List<Night> nightList;
private List<Patient> patientList;
- private List<Admission> admissionList;
+ private List<AdmissionPart> admissionPartList;
private List<RequiredPatientEquipment> requiredPatientEquipmentList;
private List<PreferredPatientEquipment> preferredPatientEquipmentList;
@@ -110,12 +110,12 @@
this.patientList = patientList;
}
- public List<Admission> getAdmissionList() {
- return admissionList;
+ public List<AdmissionPart> getAdmissionPartList() {
+ return admissionPartList;
}
- public void setAdmissionList(List<Admission> admissionList) {
- this.admissionList = admissionList;
+ public void setAdmissionPartList(List<AdmissionPart> admissionPartList) {
+ this.admissionPartList = admissionPartList;
}
public List<RequiredPatientEquipment> getRequiredPatientEquipmentList() {
@@ -158,7 +158,7 @@
facts.addAll(bedList);
facts.addAll(nightList);
facts.addAll(patientList);
- facts.addAll(admissionList);
+ facts.addAll(admissionPartList);
facts.addAll(requiredPatientEquipmentList);
facts.addAll(preferredPatientEquipmentList);
if (isInitialized()) {
@@ -183,7 +183,7 @@
clone.bedList = bedList;
clone.nightList = nightList;
clone.patientList = patientList;
- clone.admissionList = admissionList;
+ clone.admissionPartList = admissionPartList;
clone.requiredPatientEquipmentList = requiredPatientEquipmentList;
clone.preferredPatientEquipmentList = preferredPatientEquipmentList;
List<BedDesignation> clonedBedDesignationList = new ArrayList<BedDesignation>(bedDesignationList.size());
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Room.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Room.java 2009-06-28 09:08:33 UTC (rev 27223)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/Room.java 2009-06-28 09:14:32 UTC (rev 27224)
@@ -70,10 +70,10 @@
return department + "_" + name;
}
- public boolean allowsAdmission(Admission admission) {
- return department.allowsAdmission(admission)
- && allowsPatientGender(admission.getPatient())
- && hasRequiredRoomProperties(admission.getPatient());
+ public boolean allowsAdmissionPart(AdmissionPart admissionPart) {
+ return department.allowsAdmissionPart(admissionPart)
+ && allowsPatientGender(admissionPart.getPatient())
+ && hasRequiredRoomProperties(admissionPart.getPatient());
}
public boolean allowsPatientGender(Patient patient) {
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/persistence/PatientAdmissionScheduleInputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/persistence/PatientAdmissionScheduleInputConvertor.java 2009-06-28 09:08:33 UTC (rev 27223)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/persistence/PatientAdmissionScheduleInputConvertor.java 2009-06-28 09:14:32 UTC (rev 27224)
@@ -19,7 +19,7 @@
import org.drools.solver.examples.patientadmissionschedule.domain.Bed;
import org.drools.solver.examples.patientadmissionschedule.domain.Night;
import org.drools.solver.examples.patientadmissionschedule.domain.Patient;
-import org.drools.solver.examples.patientadmissionschedule.domain.Admission;
+import org.drools.solver.examples.patientadmissionschedule.domain.AdmissionPart;
import org.drools.solver.examples.patientadmissionschedule.domain.RequiredPatientEquipment;
import org.drools.solver.examples.patientadmissionschedule.domain.PreferredPatientEquipment;
import org.drools.solver.examples.patientadmissionschedule.domain.Gender;
@@ -77,7 +77,7 @@
readBedList();
readEmptyLine();
generateNightList();
- readPatientListAndAdmissionListAndRequiredPatientEquipmentListAndPreferredPatientEquipmentList();
+ readPatientListAndAdmissionPartListAndRequiredPatientEquipmentListAndPreferredPatientEquipmentList();
readEmptyLine();
readConstantLine("END.");
// TODO not all nights are planned, only the "planning horizon" nights are planned
@@ -90,7 +90,7 @@
patientAdmissionSchedule.getBedList().size(),
patientAdmissionSchedule.getNightList().size(),
patientAdmissionSchedule.getPatientList().size(),
- patientAdmissionSchedule.getAdmissionList().size()});
+ patientAdmissionSchedule.getAdmissionPartList().size()});
return patientAdmissionSchedule;
}
@@ -293,13 +293,13 @@
patientAdmissionSchedule.setNightList(nightList);
}
- private void readPatientListAndAdmissionListAndRequiredPatientEquipmentListAndPreferredPatientEquipmentList() throws IOException {
+ private void readPatientListAndAdmissionPartListAndRequiredPatientEquipmentListAndPreferredPatientEquipmentList() throws IOException {
readConstantLine("PATIENTS:");
List<Patient> patientList = new ArrayList<Patient>(patientListSize);
- List<Admission> admissionList = new ArrayList<Admission>(patientListSize);
+ List<AdmissionPart> admissionPartList = new ArrayList<AdmissionPart>(patientListSize);
List<RequiredPatientEquipment> requiredPatientEquipmentList = new ArrayList<RequiredPatientEquipment>(patientListSize * equipmentListSize);
List<PreferredPatientEquipment> preferredPatientEquipmentList = new ArrayList<PreferredPatientEquipment>(patientListSize * equipmentListSize);
- long admissionId = 0L;
+ long admissionPartId = 0L;
long requiredPatientEquipmentId = 0L;
long preferredPatientEquipmentId = 0L;
for (int i = 0; i < patientListSize; i++) {
@@ -322,33 +322,33 @@
Night endNight = indexToNightMap.get(lastNightIndex);
int patientNightListSize = endNight.getIndex() - firstNight.getIndex();
- String[] admissionTokens = splitBySpace(lineTokens[2]);
- if (admissionTokens.length % 2 != 1) {
+ String[] admissionPartTokens = splitBySpace(lineTokens[2]);
+ if (admissionPartTokens.length % 2 != 1) {
}
- int patientAdmissionListSize = Integer.parseInt(admissionTokens[0]);
- if (admissionTokens.length != ((patientAdmissionListSize * 2) + 1)) {
+ int patientAdmissionPartListSize = Integer.parseInt(admissionPartTokens[0]);
+ if (admissionPartTokens.length != ((patientAdmissionPartListSize * 2) + 1)) {
throw new IllegalArgumentException("Read line (" + line
- + ") is expected to contain " + ((patientAdmissionListSize * 2) + 1)
+ + ") is expected to contain " + ((patientAdmissionPartListSize * 2) + 1)
+ " number of tokens after 2th pipeline (|).");
}
int nextFirstNightIndex = firstNight.getIndex();
- for (int j = 1; j < admissionTokens.length; j += 2) {
- long specialismId = Long.parseLong(admissionTokens[j]);
- int admissionNightListSize = Integer.parseInt(admissionTokens[j + 1]);
- Admission admission = new Admission();
- admission.setId(admissionId);
- admission.setPatient(patient);
- admission.setSpecialism(idToSpecialismMap.get(specialismId));
- admission.setFirstNight(indexToNightMap.get(nextFirstNightIndex));
- admission.setLastNight(indexToNightMap.get(nextFirstNightIndex + admissionNightListSize - 1));
- admissionList.add(admission);
- admissionId++;
- nextFirstNightIndex += admissionNightListSize;
+ for (int j = 1; j < admissionPartTokens.length; j += 2) {
+ long specialismId = Long.parseLong(admissionPartTokens[j]);
+ int admissionPartNightListSize = Integer.parseInt(admissionPartTokens[j + 1]);
+ AdmissionPart admissionPart = new AdmissionPart();
+ admissionPart.setId(admissionPartId);
+ admissionPart.setPatient(patient);
+ admissionPart.setSpecialism(idToSpecialismMap.get(specialismId));
+ admissionPart.setFirstNight(indexToNightMap.get(nextFirstNightIndex));
+ admissionPart.setLastNight(indexToNightMap.get(nextFirstNightIndex + admissionPartNightListSize - 1));
+ admissionPartList.add(admissionPart);
+ admissionPartId++;
+ nextFirstNightIndex += admissionPartNightListSize;
}
if (nextFirstNightIndex != nextFirstNightIndex) {
throw new IllegalArgumentException("Read line (" + line
+ ") has patientNightListSize (" + patientNightListSize
- + ") different from the sum of admissionNightListSize (" + nextFirstNightIndex + ")");
+ + ") different from the sum of admissionPartNightListSize (" + nextFirstNightIndex + ")");
}
List<RequiredPatientEquipment> requiredPatientEquipmentOfPatientList = new ArrayList<RequiredPatientEquipment>(equipmentListSize);
@@ -399,7 +399,7 @@
}
}
patientAdmissionSchedule.setPatientList(patientList);
- patientAdmissionSchedule.setAdmissionList(admissionList);
+ patientAdmissionSchedule.setAdmissionPartList(admissionPartList);
patientAdmissionSchedule.setRequiredPatientEquipmentList(requiredPatientEquipmentList);
patientAdmissionSchedule.setPreferredPatientEquipmentList(preferredPatientEquipmentList);
}
More information about the jboss-svn-commits
mailing list