[jboss-svn-commits] JBL Code SVN: r17662 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main: resources/org/drools/solver/examples/itc2007/examination/solver and 1 other directory.

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

Author: ge0ffrey
Date: 2008-01-09 15:53:35 -0500 (Wed, 09 Jan 2008)
New Revision: 17662

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Exam.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl
Log:
remove mvel stuff

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Exam.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Exam.java	2008-01-09 20:22:37 UTC (rev 17661)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Exam.java	2008-01-09 20:53:35 UTC (rev 17662)
@@ -96,4 +96,12 @@
         return topic + " @ " + period + " in " + room;
     }
 
+    public int getTopicStudentListSize() {
+        return getTopic().getStudentListSize();
+    }
+
+    public int getPeriodDurationInMinutes() {
+        return getPeriod().getDurationInMinutes();
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl	2008-01-09 20:22:37 UTC (rev 17661)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl	2008-01-09 20:53:35 UTC (rev 17662)
@@ -63,25 +63,23 @@
 // More time required during a period than available in that period.
 rule "periodDurationTooShort"
     when
-        // TODO don't switch to MVEL with period.durationInMinutes
-        $exam : Exam($periodDuration : period.durationInMinutes, eval(topic.getDuration() > (Integer) $periodDuration));
+        $exam : Exam($periodDuration : periodDurationInMinutes, eval(topic.getDuration() > (Integer) $periodDuration));
     then
         insertLogical(new IntConstraintOccurrence("periodDurationTooShort", ConstraintType.NEGATIVE_HARD,
             $exam));
 end
 
 // More seating required during a period in a room than available in that room.
-rule "roomCapacityTooSmall"
+rule "roomCapacityTooSmall" // TODO improve performance, as it takes 50% of the performance
     when
         $period : Period();
         $room : Room($capacity : capacity);
-        $totalStudentListSize : Number() from accumulate(
-            // TODO don't switch to MVEL with topic.studentListSize
-            Exam(period == $period, room == $room, $studentListSize : topic.studentListSize),
+        $totalStudentListSize : Number(intValue > $capacity) from accumulate(
+            Exam(period == $period, room == $room, $studentListSize : topicStudentListSize),
             // sumInteger($studentListSize) // Vote for http://jira.jboss.com/jira/browse/JBRULES-1075
             sum($studentListSize)
         );
-        eval($totalStudentListSize.intValue() > $capacity);
+//        eval($totalStudentListSize.intValue() > $capacity);
     then
         insertLogical(new IntConstraintOccurrence("roomCapacityTooSmall", ConstraintType.NEGATIVE_HARD,
             $period, $room));