[jboss-svn-commits] JBL Code SVN: r27247 - labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/solver.

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

Author: ge0ffrey
Date: 2009-06-28 11:38:22 -0400 (Sun, 28 Jun 2009)
New Revision: 27247

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/solver/patientAdmissionScheduleScoreRules.drl
Log:
pas: fix a rule

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/solver/patientAdmissionScheduleScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/solver/patientAdmissionScheduleScoreRules.drl	2009-06-28 15:09:08 UTC (rev 27246)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/solver/patientAdmissionScheduleScoreRules.drl	2009-06-28 15:38:22 UTC (rev 27247)
@@ -95,7 +95,7 @@
     then
         insertLogical(new IntConstraintOccurrence("preferredMaximumRoomCapacity",
                 ConstraintType.NEGATIVE_SOFT,
-                ($bedDesignation.getRoomCapacity() - $bedDesignation.getPatientPreferredMaximumRoomCapacity()) * 8,
+                8 * ($bedDesignation.getRoomCapacity() - $bedDesignation.getPatientPreferredMaximumRoomCapacity()),
                 $bedDesignation));
 end
 
@@ -129,8 +129,8 @@
         not RoomEquipment(room == $room, equipment == $equipment);
     then
         insertLogical(new IntConstraintOccurrence("preferredPatientEquipment",
-                ConstraintType.NEGATIVE_SOFT, 20,
-                $bedDesignation));
+                ConstraintType.NEGATIVE_SOFT, 20 * $bedDesignation.getAdmissionPart().getNightCount(),
+                $bedDesignation, $preferredPatientEquipment));
 end
 
 // Do not change bed in an AdmissionPart on different Nights constraint is build-in