[jboss-svn-commits] JBL Code SVN: r28878 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples: itc2007/examination/solver and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Aug 8 07:40:33 EDT 2009
Author: ge0ffrey
Date: 2009-08-08 07:40:33 -0400 (Sat, 08 Aug 2009)
New Revision: 28878
Modified:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseScoreRules.drl
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/lessonschedule/solver/lessonScheduleScoreRules.drl
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/manners2009/solver/manners2009ScoreRules.drl
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/solver/nQueensScoreRules.drl
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/solver/patientAdmissionScheduleBaseScoreRules.drl
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/simple/simpleTravelingTournamentScoreRules.drl
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentScoreRules.drl
Log:
seperate score calculation rules from the normal score rules
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseScoreRules.drl 2009-08-08 08:37:09 UTC (rev 28877)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseScoreRules.drl 2009-08-08 11:40:33 UTC (rev 28878)
@@ -71,18 +71,6 @@
$lecture));
end
-// Accumulate hard constraints
-rule "hardConstraintsBroken"
- salience -1 // Do the other rules first (optional, for performance)
- when
- $hardTotal : Number() from accumulate(
- IntConstraintOccurrence(constraintType == ConstraintType.NEGATIVE_HARD, $weight : weight),
- sum($weight) // Vote for http://jira.jboss.com/jira/browse/JBRULES-1075
- );
- then
- scoreCalculator.setHardConstraintsBroken($hardTotal.intValue());
-end
-
// ############################################################################
// Soft constraints
// ############################################################################
@@ -175,6 +163,22 @@
$course));
end
+// ############################################################################
+// Calculate score
+// ############################################################################
+
+// Accumulate hard constraints
+rule "hardConstraintsBroken"
+ salience -1 // Do the other rules first (optional, for performance)
+ when
+ $hardTotal : Number() from accumulate(
+ IntConstraintOccurrence(constraintType == ConstraintType.NEGATIVE_HARD, $weight : weight),
+ sum($weight) // Vote for http://jira.jboss.com/jira/browse/JBRULES-1075
+ );
+ then
+ scoreCalculator.setHardConstraintsBroken($hardTotal.intValue());
+end
+
// Accumulate soft constraints
rule "softConstraintsBroken"
salience -1 // Do the other rules first (optional, for performance)
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 2009-08-08 08:37:09 UTC (rev 28877)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl 2009-08-08 11:40:33 UTC (rev 28878)
@@ -134,18 +134,6 @@
$leftExam, $rightExam));
end
-// Accumulate hard constraints
-rule "hardConstraintsBroken"
- salience -1 // Do the other rules first (optional, for performance)
- when
- $hardTotal : Number() from accumulate(
- IntConstraintOccurrence(constraintType == ConstraintType.NEGATIVE_HARD, $weight : weight),
- sum($weight) // Vote for http://jira.jboss.com/jira/browse/JBRULES-1075
- );
- then
- scoreCalculator.setHardConstraintsBroken($hardTotal.intValue());
-end
-
// ############################################################################
// Soft constraints
// ############################################################################
@@ -254,6 +242,22 @@
$exam));
end
+// ############################################################################
+// Calculate score
+// ############################################################################
+
+// Accumulate hard constraints
+rule "hardConstraintsBroken"
+ salience -1 // Do the other rules first (optional, for performance)
+ when
+ $hardTotal : Number() from accumulate(
+ IntConstraintOccurrence(constraintType == ConstraintType.NEGATIVE_HARD, $weight : weight),
+ sum($weight) // Vote for http://jira.jboss.com/jira/browse/JBRULES-1075
+ );
+ then
+ scoreCalculator.setHardConstraintsBroken($hardTotal.intValue());
+end
+
// Accumulate soft constraints
rule "softConstraintsBroken"
salience -1 // Do the other rules first (optional, for performance)
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/lessonschedule/solver/lessonScheduleScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/lessonschedule/solver/lessonScheduleScoreRules.drl 2009-08-08 08:37:09 UTC (rev 28877)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/lessonschedule/solver/lessonScheduleScoreRules.drl 2009-08-08 11:40:33 UTC (rev 28878)
@@ -34,6 +34,10 @@
insertLogical(new UnweightedConstraintOccurrence("multipleLessonsPerGroupPerTimeslot", $lesson));
end
+// ############################################################################
+// Calculate score
+// ############################################################################
+
rule "hardConstraintsBroken"
when
$occurrenceCount : Number() from accumulate(
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/manners2009/solver/manners2009ScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/manners2009/solver/manners2009ScoreRules.drl 2009-08-08 08:37:09 UTC (rev 28877)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/manners2009/solver/manners2009ScoreRules.drl 2009-08-08 11:40:33 UTC (rev 28878)
@@ -77,6 +77,10 @@
$leftDesignation, $rightDesignation));
end
+// ############################################################################
+// Calculate score
+// ############################################################################
+
rule "hardConstraintsBroken"
when
$occurrenceCount : Number() from accumulate(
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/solver/nQueensScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/solver/nQueensScoreRules.drl 2009-08-08 08:37:09 UTC (rev 28877)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/solver/nQueensScoreRules.drl 2009-08-08 11:40:33 UTC (rev 28878)
@@ -39,6 +39,10 @@
insertLogical(new UnweightedConstraintOccurrence("multipleQueensDescendingDiagonal", $q1, $q2));
end
+// ############################################################################
+// Calculate score
+// ############################################################################
+
rule "hardConstraintsBroken"
when
$occurrenceCount : Number() from accumulate(
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/solver/patientAdmissionScheduleBaseScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/solver/patientAdmissionScheduleBaseScoreRules.drl 2009-08-08 08:37:09 UTC (rev 28877)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/solver/patientAdmissionScheduleBaseScoreRules.drl 2009-08-08 11:40:33 UTC (rev 28878)
@@ -64,23 +64,10 @@
// Not yet applicable: Patient's requiredRoomCapacity constraint
-// Accumulate hard constraints
-rule "hardConstraintsBroken"
- salience -1 // Do the other rules first (optional, for performance)
- when
- $hardTotal : Number() from accumulate(
- IntConstraintOccurrence(constraintType == ConstraintType.NEGATIVE_HARD, $weight : weight),
- sum($weight) // Vote for http://jira.jboss.com/jira/browse/JBRULES-1075
- );
- then
- scoreCalculator.setHardConstraintsBroken($hardTotal.intValue());
-end
-
// ############################################################################
// Soft constraints
// ############################################################################
-
// Patient preferredMaximumRoomCapacity
rule "preferredMaximumRoomCapacity"
when
@@ -141,6 +128,22 @@
// Do not change bed in an AdmissionPart on different Nights constraint is build-in
+// ############################################################################
+// Calculate score
+// ############################################################################
+
+// Accumulate hard constraints
+rule "hardConstraintsBroken"
+ salience -1 // Do the other rules first (optional, for performance)
+ when
+ $hardTotal : Number() from accumulate(
+ IntConstraintOccurrence(constraintType == ConstraintType.NEGATIVE_HARD, $weight : weight),
+ sum($weight) // Vote for http://jira.jboss.com/jira/browse/JBRULES-1075
+ );
+ then
+ scoreCalculator.setHardConstraintsBroken($hardTotal.intValue());
+end
+
// Accumulate soft constraints
rule "softConstraintsBroken"
salience -1 // Do the other rules first (optional, for performance)
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/simple/simpleTravelingTournamentScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/simple/simpleTravelingTournamentScoreRules.drl 2009-08-08 08:37:09 UTC (rev 28877)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/simple/simpleTravelingTournamentScoreRules.drl 2009-08-08 11:40:33 UTC (rev 28878)
@@ -58,17 +58,6 @@
insertLogical(new UnweightedConstraintOccurrence("matchRepeater", $m));
end
-rule "hardConstraintsBroken"
- salience -1 // Do the other rules first (optional, for performance)
- when
- $occurrenceCount : Number() from accumulate(
- $unweightedConstraintOccurrence : UnweightedConstraintOccurrence(),
- count($unweightedConstraintOccurrence)
- );
- then
- scoreCalculator.setHardConstraintsBroken($occurrenceCount.intValue());
-end
-
// ############################################################################
// Soft constraints
// ############################################################################
@@ -109,6 +98,21 @@
insertLogical(new Hop($team, $fromTeam, $team));
end
+// ############################################################################
+// Calculate score
+// ############################################################################
+
+rule "hardConstraintsBroken"
+ salience -1 // Do the other rules first (optional, for performance)
+ when
+ $occurrenceCount : Number() from accumulate(
+ $unweightedConstraintOccurrence : UnweightedConstraintOccurrence(),
+ count($unweightedConstraintOccurrence)
+ );
+ then
+ scoreCalculator.setHardConstraintsBroken($occurrenceCount.intValue());
+end
+
rule "softConstraintsBroken"
salience -1 // Do the other rules first (optional, for performance)
when
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentScoreRules.drl 2009-08-08 08:37:09 UTC (rev 28877)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentScoreRules.drl 2009-08-08 11:40:33 UTC (rev 28878)
@@ -49,17 +49,6 @@
insertLogical(new UnweightedConstraintOccurrence("matchRepeater", $m));
end
-rule "hardConstraintsBroken"
- salience -1 // Do the other rules first (optional, for performance)
- when
- $occurrenceCount : Number() from accumulate(
- $unweightedConstraintOccurrence : UnweightedConstraintOccurrence(),
- count($unweightedConstraintOccurrence)
- );
- then
- scoreCalculator.setHardConstraintsBroken($occurrenceCount.intValue());
-end
-
// ############################################################################
// Soft constraints
// ############################################################################
@@ -100,6 +89,21 @@
insertLogical(new Hop($team, $fromTeam, $team));
end
+// ############################################################################
+// Calculate score
+// ############################################################################
+
+rule "hardConstraintsBroken"
+ salience -1 // Do the other rules first (optional, for performance)
+ when
+ $occurrenceCount : Number() from accumulate(
+ $unweightedConstraintOccurrence : UnweightedConstraintOccurrence(),
+ count($unweightedConstraintOccurrence)
+ );
+ then
+ scoreCalculator.setHardConstraintsBroken($occurrenceCount.intValue());
+end
+
rule "softConstraintsBroken"
salience -1 // Do the other rules first (optional, for performance)
when
More information about the jboss-svn-commits
mailing list