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

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

Author: ge0ffrey
Date: 2010-05-30 04:30:36 -0400 (Sun, 30 May 2010)
New Revision: 33181

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/Pattern.java
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/PatternEntry.java
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/persistence/NurseRosteringSolutionImporter.java
Log:
better toString

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/Pattern.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/Pattern.java	2010-05-30 08:13:37 UTC (rev 33180)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/Pattern.java	2010-05-30 08:30:36 UTC (rev 33181)
@@ -50,7 +50,7 @@
 
     @Override
     public String toString() {
-        return code;
+        return code + " " + patternEntryList;
     }
 
     public int getPatternEntrySize() {

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/PatternEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/PatternEntry.java	2010-05-30 08:13:37 UTC (rev 33180)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/PatternEntry.java	2010-05-30 08:30:36 UTC (rev 33181)
@@ -13,10 +13,10 @@
     private Pattern pattern;
     private int entryIndex;
 
+    private PatternEntryPropertyWildcard shiftTypeWildcard;
+    private ShiftType shiftType;
     private PatternEntryPropertyWildcard dayOfWeekWildcard;
     private DayOfWeek dayOfWeek;
-    private PatternEntryPropertyWildcard shiftTypeWildcard;
-    private ShiftType shiftType;
 
     public Pattern getPattern() {
         return pattern;
@@ -34,6 +34,22 @@
         this.entryIndex = entryIndex;
     }
 
+    public PatternEntryPropertyWildcard getShiftTypeWildcard() {
+        return shiftTypeWildcard;
+    }
+
+    public void setShiftTypeWildcard(PatternEntryPropertyWildcard shiftTypeWildcard) {
+        this.shiftTypeWildcard = shiftTypeWildcard;
+    }
+
+    public ShiftType getShiftType() {
+        return shiftType;
+    }
+
+    public void setShiftType(ShiftType shiftType) {
+        this.shiftType = shiftType;
+    }
+
     public PatternEntryPropertyWildcard getDayOfWeekWildcard() {
         return dayOfWeekWildcard;
     }
@@ -50,22 +66,6 @@
         this.dayOfWeek = dayOfWeek;
     }
 
-    public PatternEntryPropertyWildcard getShiftTypeWildcard() {
-        return shiftTypeWildcard;
-    }
-
-    public void setShiftTypeWildcard(PatternEntryPropertyWildcard shiftTypeWildcard) {
-        this.shiftTypeWildcard = shiftTypeWildcard;
-    }
-
-    public ShiftType getShiftType() {
-        return shiftType;
-    }
-
-    public void setShiftType(ShiftType shiftType) {
-        this.shiftType = shiftType;
-    }
-
     public int compareTo(PatternEntry other) {
         return new CompareToBuilder()
                 .append(id, other.id)
@@ -74,8 +74,9 @@
 
     @Override
     public String toString() {
-        return pattern + "-" + entryIndex + ": "
-                + dayOfWeekWildcard + "(" + dayOfWeek + ") " + shiftTypeWildcard + "(" + shiftType + ")";
+        return pattern.getCode() + "-" + entryIndex + ": "
+                + (shiftTypeWildcard == PatternEntryPropertyWildcard.SPECIFIC ? shiftType : shiftTypeWildcard) + " on "
+                + (dayOfWeekWildcard == PatternEntryPropertyWildcard.SPECIFIC ? dayOfWeek : dayOfWeekWildcard);
     }
 
 }

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/persistence/NurseRosteringSolutionImporter.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/persistence/NurseRosteringSolutionImporter.java	2010-05-30 08:13:37 UTC (rev 33180)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/persistence/NurseRosteringSolutionImporter.java	2010-05-30 08:30:36 UTC (rev 33181)
@@ -352,10 +352,10 @@
                         patternEntry.setId(patternEntryId);
                         patternEntry.setPattern(pattern);
                         patternEntry.setEntryIndex(entryIndex);
+                        patternEntry.setShiftTypeWildcard(shiftTypeWildcard);
+                        patternEntry.setShiftType(shiftType);
                         patternEntry.setDayOfWeekWildcard(dayOfWeekWildcard);
                         patternEntry.setDayOfWeek(dayOfWeek);
-                        patternEntry.setShiftTypeWildcard(shiftTypeWildcard);
-                        patternEntry.setShiftType(shiftType);
                         patternEntryList.add(patternEntry);
                         patternEntryListOfPattern.add(patternEntry);
                         patternEntryId++;