[jboss-svn-commits] JBL Code SVN: r16465 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples: travelingtournament/solver/simple and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Nov 9 09:29:26 EST 2007
Author: ge0ffrey
Date: 2007-11-09 09:29:26 -0500 (Fri, 09 Nov 2007)
New Revision: 16465
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/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:
use dialect "java", but on a package level
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-11-09 14:21:26 UTC (rev 16464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl 2007-11-09 14:29:26 UTC (rev 16465)
@@ -1,4 +1,5 @@
package org.drools.solver.examples.itc2007.examination.solver;
+ dialect "java"
import org.drools.solver.core.evaluation.scorecalculator.HardAndSoftConstraintScoreCalculator;
@@ -19,7 +20,6 @@
// Two exams in the same period which share students.
rule "conflictingExamsInSamePeriod"
- dialect "java"
when
$student : Student();
$exam : Exam($id : id, topic.studentList contains $student, $period : period);
@@ -30,7 +30,6 @@
// More time required during a period than available in that period.
rule "periodDurationTooShort"
- dialect "java"
when
$exam : Exam($periodDuration : period.durationInMinutes, topic.duration > $periodDuration);
then
@@ -39,7 +38,6 @@
// More seating required during a period in a room than available in that room.
rule "roomCapacityTooSmall"
- dialect "java"
when
$period : Period();
$room : Room($capacity : capacity);
@@ -61,7 +59,6 @@
rule "hardConstraintsBroken"
salience -1 // Finish the other rules first (optional, for performance)
- dialect "java"
when
$hardCount : Number() from accumulate(
$w : WorkaroundMultiplePatternAccumulate(),
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 2007-11-09 14:21:26 UTC (rev 16464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/simple/simpleTravelingTournamentScoreRules.drl 2007-11-09 14:29:26 UTC (rev 16465)
@@ -1,4 +1,5 @@
package org.drools.solver.examples.travelingtournament.simple.solver;
+ dialect "java"
import org.drools.solver.core.evaluation.scorecalculator.HardAndSoftConstraintScoreCalculator;
@@ -39,7 +40,6 @@
//end
rule "multipleMatchesPerTeamPerDay"
- dialect "java"
when
$team : Team();
$m : Match( $id : id, homeTeam == $team, $day : day )
@@ -51,7 +51,6 @@
end
rule "fourConsecutiveHomeMatches"
- dialect "java"
when
$m : Match($homeTeam : homeTeam, $day1 : day);
Match(homeTeam == $homeTeam, eval(day.getIndex() == $day1.getIndex() + 1));
@@ -62,7 +61,6 @@
end
rule "fourConsecutiveAwayMatches"
- dialect "java"
when
$m : Match($awayTeam : awayTeam, $day1 : day);
Match(awayTeam == $awayTeam, eval(day.getIndex() == $day1.getIndex() + 1));
@@ -73,7 +71,6 @@
end
rule "matchRepeater"
- dialect "java"
when
$m : Match($homeTeam : homeTeam, $awayTeam : awayTeam, $day1 : day);
Match(homeTeam == $awayTeam, awayTeam == $homeTeam, eval(day.getIndex() == $day1.getIndex() + 1));
@@ -83,7 +80,6 @@
rule "hardConstraintsBroken"
salience -1 // Finish the other rules first (optional, for performance)
- dialect "java"
when
$hardCount : Long() from accumulate(
$w : WorkaroundMultiplePatternAccumulate(),
@@ -95,7 +91,6 @@
rule "startToAwayHop"
- dialect "java"
when
Match($toTeam : homeTeam, $team : awayTeam, $day : day);
not Day(eval(index == $day.getIndex() - 1));
@@ -103,7 +98,6 @@
insertLogical(new Hop($team, $team, $toTeam));
end
rule "homeToAwayHop"
- dialect "java"
when
Match($team : homeTeam, $day1 : day);
Match($toTeam : homeTeam, awayTeam == $team, eval(day.getIndex() == $day1.getIndex() + 1));
@@ -111,7 +105,6 @@
insertLogical(new Hop($team, $team, $toTeam));
end
rule "awayToAwayHop"
- dialect "java"
when
Match($fromTeam : homeTeam, $team : awayTeam, $day1 : day);
Match($toTeam : homeTeam, awayTeam == $team, eval(day.getIndex() == $day1.getIndex() + 1));
@@ -119,7 +112,6 @@
insertLogical(new Hop($team, $fromTeam, $toTeam));
end
rule "awayToHomeHop"
- dialect "java"
when
Match($fromTeam : homeTeam, $team : awayTeam, $day1 : day);
Match(homeTeam == $team, eval(day.getIndex() == $day1.getIndex() + 1));
@@ -127,7 +119,6 @@
insertLogical(new Hop($team, $fromTeam, $team));
end
rule "awayToEndHop"
- dialect "java"
when
Match($fromTeam : homeTeam, $team : awayTeam, $day : day);
not Day(eval(index == $day.getIndex() + 1));
@@ -137,7 +128,6 @@
rule "softConstraintsBroken"
salience -1 // Finish the other rules first (optional, for performance)
- dialect "java"
when
$totalDistance : Double() from accumulate(
Hop($distance : distance),
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 2007-11-09 14:21:26 UTC (rev 16464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentScoreRules.drl 2007-11-09 14:29:26 UTC (rev 16465)
@@ -1,4 +1,5 @@
package org.drools.solver.examples.travelingtournament.smart.solver;
+ dialect "java"
import org.drools.solver.core.evaluation.scorecalculator.HardAndSoftConstraintScoreCalculator;
@@ -33,7 +34,6 @@
//end
rule "fourConsecutiveHomeMatches"
- dialect "java"
when
$m : Match($homeTeam : homeTeam, $day1 : day);
Match(homeTeam == $homeTeam, eval(day.getIndex() == $day1.getIndex() + 1));
@@ -44,7 +44,6 @@
end
rule "fourConsecutiveAwayMatches"
- dialect "java"
when
$m : Match($awayTeam : awayTeam, $day1 : day);
Match(awayTeam == $awayTeam, eval(day.getIndex() == $day1.getIndex() + 1));
@@ -55,7 +54,6 @@
end
rule "matchRepeater"
- dialect "java"
when
$m : Match($homeTeam : homeTeam, $awayTeam : awayTeam, $day1 : day);
Match(homeTeam == $awayTeam, awayTeam == $homeTeam, eval(day.getIndex() == $day1.getIndex() + 1));
@@ -65,7 +63,6 @@
rule "hardConstraintsBroken"
salience -1 // Finish the other rules first (optional, for performance)
- dialect "java"
when
$hardCount : Number() from accumulate(
$w : WorkaroundMultiplePatternAccumulate(),
@@ -77,7 +74,6 @@
end
rule "startToAwayHop"
- dialect "java"
when
Match($toTeam : homeTeam, $team : awayTeam, $day : day);
not Day(eval(index == $day.getIndex() - 1));
@@ -85,7 +81,6 @@
insertLogical(new Hop($team, $team, $toTeam));
end
rule "homeToAwayHop"
- dialect "java"
when
Match($team : homeTeam, $day1 : day);
Match($toTeam : homeTeam, awayTeam == $team, eval(day.getIndex() == $day1.getIndex() + 1));
@@ -93,7 +88,6 @@
insertLogical(new Hop($team, $team, $toTeam));
end
rule "awayToAwayHop"
- dialect "java"
when
Match($fromTeam : homeTeam, $team : awayTeam, $day1 : day);
Match($toTeam : homeTeam, awayTeam == $team, eval(day.getIndex() == $day1.getIndex() + 1));
@@ -101,7 +95,6 @@
insertLogical(new Hop($team, $fromTeam, $toTeam));
end
rule "awayToHomeHop"
- dialect "java"
when
Match($fromTeam : homeTeam, $team : awayTeam, $day1 : day);
Match(homeTeam == $team, eval(day.getIndex() == $day1.getIndex() + 1));
@@ -109,7 +102,6 @@
insertLogical(new Hop($team, $fromTeam, $team));
end
rule "awayToEndHop"
- dialect "java"
when
Match($fromTeam : homeTeam, $team : awayTeam, $day : day);
not Day(eval(index == $day.getIndex() + 1));
@@ -119,7 +111,6 @@
rule "softConstraintsBroken"
salience -1 // Finish the other rules first (optional, for performance)
- dialect "java"
when
$totalDistance : Number() from accumulate(
Hop($distance : distance),
More information about the jboss-svn-commits
mailing list