[jboss-svn-commits] JBL Code SVN: r32886 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples: travelingtournament/domain/solver and 1 other directory.

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

Author: ge0ffrey
Date: 2010-05-14 07:51:46 -0400 (Fri, 14 May 2010)
New Revision: 32886

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeConsecutiveAssignment.java
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeConsecutiveAssignmentEnd.java
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeConsecutiveAssignmentStart.java
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/domain/solver/Hop.java
Log:
compareTo and toString

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeConsecutiveAssignment.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeConsecutiveAssignment.java	2010-05-14 11:01:42 UTC (rev 32885)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeConsecutiveAssignment.java	2010-05-14 11:51:46 UTC (rev 32886)
@@ -2,6 +2,7 @@
 
 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;
@@ -10,7 +11,7 @@
 /**
  * @author Geoffrey De Smet
  */
-public class EmployeeConsecutiveAssignment implements Serializable {
+public class EmployeeConsecutiveAssignment implements Comparable<EmployeeConsecutiveAssignment>, Serializable {
 
     private Employee employee;
     private ShiftDate firstShiftDate;
@@ -69,6 +70,14 @@
                 .toHashCode();
     }
 
+    public int compareTo(EmployeeConsecutiveAssignment other) {
+        return new CompareToBuilder()
+                .append(employee, other.employee)
+                .append(firstShiftDate, other.firstShiftDate)
+                .append(lastShiftDate, other.lastShiftDate)
+                .toComparison();
+    }
+
     public int getFirstShiftDateDayIndex() {
         return firstShiftDate.getDayIndex();
     }
@@ -81,4 +90,9 @@
         return lastShiftDate.getDayIndex() - firstShiftDate.getDayIndex() + 1;
     }
 
+    @Override
+    public String toString() {
+        return employee + " " + firstShiftDate + " - " + lastShiftDate;
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeConsecutiveAssignmentEnd.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeConsecutiveAssignmentEnd.java	2010-05-14 11:01:42 UTC (rev 32885)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeConsecutiveAssignmentEnd.java	2010-05-14 11:51:46 UTC (rev 32886)
@@ -2,6 +2,7 @@
 
 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;
@@ -10,7 +11,7 @@
 /**
  * @author Geoffrey De Smet
  */
-public class EmployeeConsecutiveAssignmentEnd implements Serializable {
+public class EmployeeConsecutiveAssignmentEnd implements Comparable<EmployeeConsecutiveAssignmentEnd>, Serializable {
 
     private Employee employee;
     private ShiftDate shiftDate;
@@ -57,8 +58,20 @@
                 .toHashCode();
     }
 
+    public int compareTo(EmployeeConsecutiveAssignmentEnd other) {
+        return new CompareToBuilder()
+                .append(employee, other.employee)
+                .append(shiftDate, other.shiftDate)
+                .toComparison();
+    }
+
     public int getShiftDateDayIndex() {
         return shiftDate.getDayIndex();
     }
 
+    @Override
+    public String toString() {
+        return employee + " ... - " + shiftDate;
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeConsecutiveAssignmentStart.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeConsecutiveAssignmentStart.java	2010-05-14 11:01:42 UTC (rev 32885)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/EmployeeConsecutiveAssignmentStart.java	2010-05-14 11:51:46 UTC (rev 32886)
@@ -2,6 +2,7 @@
 
 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;
@@ -10,7 +11,8 @@
 /**
  * @author Geoffrey De Smet
  */
-public class EmployeeConsecutiveAssignmentStart implements Serializable {
+public class EmployeeConsecutiveAssignmentStart implements Comparable<EmployeeConsecutiveAssignmentStart>,
+        Serializable {
 
     private Employee employee;
     private ShiftDate shiftDate;
@@ -57,8 +59,20 @@
                 .toHashCode();
     }
 
+    public int compareTo(EmployeeConsecutiveAssignmentStart other) {
+        return new CompareToBuilder()
+                .append(employee, other.employee)
+                .append(shiftDate, other.shiftDate)
+                .toComparison();
+    }
+
     public int getShiftDateDayIndex() {
         return shiftDate.getDayIndex();
     }
 
+    @Override
+    public String toString() {
+        return employee + " " + shiftDate + " - ...";
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/domain/solver/Hop.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/domain/solver/Hop.java	2010-05-14 11:01:42 UTC (rev 32885)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/domain/solver/Hop.java	2010-05-14 11:51:46 UTC (rev 32886)
@@ -3,6 +3,7 @@
 import java.io.Serializable;
 import java.util.Map;
 
+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.travelingtournament.domain.Team;
@@ -10,7 +11,7 @@
 /**
  * @author Geoffrey De Smet
  */
-public class Hop implements Serializable {
+public class Hop implements Comparable<Hop>, Serializable {
 
     private Team team;
     private Team fromTeam;
@@ -74,5 +75,18 @@
                 .append(toTeam)
                 .toHashCode();
     }
+
+    public int compareTo(Hop other) {
+        return new CompareToBuilder()
+                .append(team, other.team)
+                .append(fromTeam, other.fromTeam)
+                .append(toTeam, other.toTeam)
+                .toComparison();
+    }
+
+    @Override
+    public String toString() {
+        return team + ": " + fromTeam + " -> " + toTeam;
+    }
     
 }