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

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

Author: ge0ffrey
Date: 2007-12-31 08:45:56 -0500 (Mon, 31 Dec 2007)
New Revision: 17464

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl
Log:
 dayIndex score rules

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	2007-12-31 13:40:56 UTC (rev 17463)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl	2007-12-31 13:45:56 UTC (rev 17464)
@@ -121,9 +121,7 @@
             $rightSideTopic : rightSideTopic
         )
         Exam(topic == $leftSideTopic, $leftSidePeriod : period);
-        Exam(topic == $rightSideTopic, (period.dateInDays < $leftSidePeriod.dateInDays)
-                || (period.dateInDays == $leftSidePeriod.dateInDays
-                && period.startTimeInMinutes <= $leftSidePeriod.startTimeInMinutes));
+        Exam(topic == $rightSideTopic, eval(period.getPeriodIndex() <= $leftSidePeriod.getPeriodIndex()));
     then
         insertLogical(new IntConstraintOccurrence("periodHardConstraintAfter", ConstraintType.NEGATIVE_HARD,
             $periodHardConstraint));
@@ -180,9 +178,9 @@
         $topicConflict : TopicConflict($leftTopic : leftTopic, $rightTopic : rightTopic);
         $leftExam : Exam(topic == $leftTopic, $period : period);
         // This implementation is slower (turn into MVEL complilation):
-        // $rightExam : Exam(topic == $rightTopic, period.dateInDays == $period.dateInDays);
+        // $rightExam : Exam(topic == $rightTopic, period.dayIndex == $period.dayIndex);
         // This implementation is faster:
-        $rightExam : Exam(topic == $rightTopic, eval(period.getDateInDays() == $period.getDateInDays()));
+        $rightExam : Exam(topic == $rightTopic, eval(period.getDayIndex() == $period.getDayIndex()));
         // TODO twoExamsInARow should be excluded from twoExamsInADay
     then
         insertLogical(new IntConstraintOccurrence("twoExamsInADay", ConstraintType.NEGATIVE_SOFT,