[jboss-svn-commits] JBL Code SVN: r27238 - in labs/jbossrules/trunk/drools-solver: drools-solver-core and 3 other directories.

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

Author: ge0ffrey
Date: 2009-06-28 09:41:25 -0400 (Sun, 28 Jun 2009)
New Revision: 27238

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-core/pom.xml
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/BedDesignation.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/solver/solution/initializer/PatientAdmissionScheduleStartingSolutionInitializer.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/solver/patientAdmissionScheduleScoreRules.drl
   labs/jbossrules/trunk/drools-solver/pom.xml
Log:
JBRULES-2145 workaround

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/pom.xml	2009-06-28 13:08:40 UTC (rev 27237)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/pom.xml	2009-06-28 13:41:25 UTC (rev 27238)
@@ -21,6 +21,10 @@
         <!-- Internal dependencies -->
         <dependency>
             <groupId>org.drools</groupId>
+            <artifactId>drools-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.drools</groupId>
             <artifactId>drools-core</artifactId>
         </dependency>
         <dependency>

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/BedDesignation.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/BedDesignation.java	2009-06-28 13:08:40 UTC (rev 27237)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/domain/BedDesignation.java	2009-06-28 13:41:25 UTC (rev 27238)
@@ -85,4 +85,8 @@
         return bed.getRoom();
     }
 
+    public GenderLimitation getRoomGenderLimitation() {
+        return bed.getRoom().getGenderLimitation();
+    }
+
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/solver/solution/initializer/PatientAdmissionScheduleStartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/solver/solution/initializer/PatientAdmissionScheduleStartingSolutionInitializer.java	2009-06-28 13:08:40 UTC (rev 27237)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/solver/solution/initializer/PatientAdmissionScheduleStartingSolutionInitializer.java	2009-06-28 13:41:25 UTC (rev 27238)
@@ -39,7 +39,9 @@
         List<BedDesignation> bedDesignationList = createBedDesignationList(patientAdmissionSchedule);
         // Assign one admissionPart at a time
         List<Bed> bedList = patientAdmissionSchedule.getBedList();
+int stillRunningCounter = 0; // TODO https://jira.jboss.org/jira/browse/JBRULES-2145
         for (BedDesignation bedDesignation : bedDesignationList) {
+System.out.println("Trunk is bugged " + ++stillRunningCounter +"/" + bedDesignationList.size() + " but we are not working on trunk. See JBRULES-2145.");
             Score unscheduledScore = localSearchSolverScope.calculateScoreFromWorkingMemory();
             boolean perfectMatch = false;
             Score bestScore = DefaultHardAndSoftScore.valueOf(Integer.MIN_VALUE);

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 13:08:40 UTC (rev 27237)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/solver/patientAdmissionScheduleScoreRules.drl	2009-06-28 13:41:25 UTC (rev 27238)
@@ -48,12 +48,12 @@
 // Two admissionParts in the same bed for a number of nights.
 rule "differentGenderInSameGenderRoomInSameNight"
     when
-        $room : Room(genderLimitation == GenderLimitation.SAME_GENDER);
         $admissionPartConflict : AdmissionPartConflict($leftAdmissionPart : leftAdmissionPart,
                 $rightAdmissionPart : rightAdmissionPart,
                 differentGender == true);
-        $leftBedDesignation : BedDesignation(admissionPart == $leftAdmissionPart, room == $room);
-        $rightBedDesignation : BedDesignation(admissionPart == $rightAdmissionPart, room == $room);
+        $leftBedDesignation : BedDesignation(roomGenderLimitation == GenderLimitation.SAME_GENDER,
+                admissionPart == $leftAdmissionPart, $room : room);
+        $rightBedDesignation : BedDesignation(room == $room, admissionPart == $rightAdmissionPart);
     then
         insertLogical(new IntConstraintOccurrence("differentGenderInSameGenderRoomInSameNight", ConstraintType.NEGATIVE_HARD,
                 $admissionPartConflict.getNightSize(),

Modified: labs/jbossrules/trunk/drools-solver/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/pom.xml	2009-06-28 13:08:40 UTC (rev 27237)
+++ labs/jbossrules/trunk/drools-solver/pom.xml	2009-06-28 13:41:25 UTC (rev 27238)
@@ -41,20 +41,25 @@
         <module>drools-solver-examples</module>
     </modules>
 
-    <!-- Uncomment to depend on a stable release of drools-core and drools-compiler -->
+    <!-- Uncomment to depend on a stable release of drools-api, drools-core and drools-compiler -->
     <dependencyManagement>
-        <!--<dependencies>-->
-            <!--<dependency>-->
-                <!--<groupId>org.drools</groupId>-->
-                <!--<artifactId>drools-core</artifactId>-->
-                <!--<version>4.0.4</version>-->
-            <!--</dependency>-->
-            <!--<dependency>-->
-                <!--<groupId>org.drools</groupId>-->
-                <!--<artifactId>drools-compiler</artifactId>-->
-                <!--<version>4.0.4</version>-->
-            <!--</dependency>-->
-        <!--</dependencies>-->
+        <dependencies><!-- comment these out to reproduce JBRULES-2145 -->
+            <dependency>
+                <groupId>org.drools</groupId>
+                <artifactId>drools-api</artifactId>
+                <version>5.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.drools</groupId>
+                <artifactId>drools-core</artifactId>
+                <version>5.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.drools</groupId>
+                <artifactId>drools-compiler</artifactId>
+                <version>5.0.1</version>
+            </dependency>
+        </dependencies>
     </dependencyManagement>
 
 </project>