[jboss-svn-commits] JBL Code SVN: r27245 - 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]

Author: ge0ffrey
Date: 2009-06-28 11:06:34 -0400 (Sun, 28 Jun 2009)
New Revision: 27245

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/AdmissionPart.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/persistence/PatientAdmissionScheduleOutputConvertor.java
Log:
pas: outputconverter fix

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/AdmissionPart.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/AdmissionPart.java	2009-06-28 14:51:05 UTC (rev 27244)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/AdmissionPart.java	2009-06-28 15:06:34 UTC (rev 27245)
@@ -59,6 +59,10 @@
         return patient + "(" + firstNight + "-" + lastNight + ")";
     }
 
+    public int getNightCount() {
+        return lastNight.getIndex() - firstNight.getIndex() + 1;
+    }
+
     public int calculateSameNightCount(AdmissionPart other) {
         int firstNightIndex = Math.max(getFirstNight().getIndex(), other.getFirstNight().getIndex());
         int lastNightIndex = Math.min(getLastNight().getIndex(), other.getLastNight().getIndex());

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/persistence/PatientAdmissionScheduleOutputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/persistence/PatientAdmissionScheduleOutputConvertor.java	2009-06-28 14:51:05 UTC (rev 27244)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/persistence/PatientAdmissionScheduleOutputConvertor.java	2009-06-28 15:06:34 UTC (rev 27245)
@@ -68,7 +68,9 @@
             bufferedWriter.write(Long.toString(patient.getId()));
             for (BedDesignation bedDesignation : patientAdmissionSchedule.getBedDesignationList()) {
                 if (bedDesignation.getPatient().equals(patient)) {
-                    bufferedWriter.write(" " + Long.toString(bedDesignation.getBed().getId()));
+                    for (int i = 0; i < bedDesignation.getAdmissionPart().getNightCount(); i++) {
+                        bufferedWriter.write(" " + Long.toString(bedDesignation.getBed().getId()));
+                    }
                 }
             }
             bufferedWriter.write("\n");