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

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

Author: ge0ffrey
Date: 2009-06-28 16:06:31 -0400 (Sun, 28 Jun 2009)
New Revision: 27254

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/solver/AdmissionPartSpecialismMissingInRoom.java
Log:
pas: unuseful caching

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 20:04:01 UTC (rev 27253)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/PatientAdmissionSchedule.java	2009-06-28 20:06:31 UTC (rev 27254)
@@ -170,7 +170,7 @@
             facts.addAll(bedDesignationList);
         }
         facts.addAll(calculateAdmissionPartConflictList());
-        facts.addAll(calculateAdmissionPartSpecialismMissingInRoomList());
+//        facts.addAll(calculateAdmissionPartSpecialismMissingInRoomList());
         return facts;
     }
 
@@ -190,28 +190,28 @@
         return admissionPartConflictList;
     }
 
-    private List<AdmissionPartSpecialismMissingInRoom> calculateAdmissionPartSpecialismMissingInRoomList() {
-        List<AdmissionPartSpecialismMissingInRoom> admissionPartSpecialismMissingInRoomList
-                = new ArrayList<AdmissionPartSpecialismMissingInRoom>();
-        for (AdmissionPart admissionPart : admissionPartList) {
-            if (admissionPart.getSpecialism() != null) {
-                for (Room room : roomList) {
-                    int mininumPriority = Integer.MAX_VALUE;
-                    for (RoomSpecialism roomSpecialism : room.getRoomSpecialismList()) {
-                        if (roomSpecialism.getSpecialism().equals(admissionPart.getSpecialism())) {
-                            mininumPriority = Math.min(mininumPriority, roomSpecialism.getPriority());
-                        }
-                    }
-                    int weight = (mininumPriority == Integer.MAX_VALUE) ? 2 : mininumPriority - 1;
-                    if (weight > 0) {
-                        admissionPartSpecialismMissingInRoomList.add(
-                                new AdmissionPartSpecialismMissingInRoom(admissionPart, room, mininumPriority));
-                    }
-                }
-            }
-        }
-        return admissionPartSpecialismMissingInRoomList;
-    }
+//    private List<AdmissionPartSpecialismMissingInRoom> calculateAdmissionPartSpecialismMissingInRoomList() {
+//        List<AdmissionPartSpecialismMissingInRoom> admissionPartSpecialismMissingInRoomList
+//                = new ArrayList<AdmissionPartSpecialismMissingInRoom>();
+//        for (AdmissionPart admissionPart : admissionPartList) {
+//            if (admissionPart.getSpecialism() != null) {
+//                for (Room room : roomList) {
+//                    int mininumPriority = Integer.MAX_VALUE;
+//                    for (RoomSpecialism roomSpecialism : room.getRoomSpecialismList()) {
+//                        if (roomSpecialism.getSpecialism().equals(admissionPart.getSpecialism())) {
+//                            mininumPriority = Math.min(mininumPriority, roomSpecialism.getPriority());
+//                        }
+//                    }
+//                    int weight = (mininumPriority == Integer.MAX_VALUE) ? 2 : mininumPriority - 1;
+//                    if (weight > 0) {
+//                        admissionPartSpecialismMissingInRoomList.add(
+//                                new AdmissionPartSpecialismMissingInRoom(admissionPart, room, mininumPriority));
+//                    }
+//                }
+//            }
+//        }
+//        return admissionPartSpecialismMissingInRoomList;
+//    }
 
     /**
      * Clone will only deep copy the bedDesignationList

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/solver/AdmissionPartSpecialismMissingInRoom.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/solver/AdmissionPartSpecialismMissingInRoom.java	2009-06-28 20:04:01 UTC (rev 27253)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/solver/AdmissionPartSpecialismMissingInRoom.java	2009-06-28 20:06:31 UTC (rev 27254)
@@ -10,6 +10,7 @@
  * Calculated during initialization, not modified during score calculation.
  * @author Geoffrey De Smet
  */
+ at Deprecated
 public class AdmissionPartSpecialismMissingInRoom implements Serializable {
 
     private AdmissionPart admissionPart;