[jboss-svn-commits] JBL Code SVN: r31893 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples: lessonschedule/solver/move and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 1 10:49:17 EST 2010
Author: tirelli
Date: 2010-03-01 10:49:16 -0500 (Mon, 01 Mar 2010)
New Revision: 31893
Modified:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/solver/move/TimeslotChangeMove.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/solver/solution/initializer/Manners2009StartingSolutionInitializer.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/solver/move/YChangeMove.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/solver/solution/initializer/PatientAdmissionScheduleStartingSolutionInitializer.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/solver/simple/move/DayChangeMove.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/solver/smart/move/MatchSwapMove.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/solver/smart/move/MultipleMatchListRotateMove.java
Log:
JBRULES-2339: JBRULES-2340: merging true modify into trunk
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java 2010-03-01 15:46:54 UTC (rev 31892)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java 2010-03-01 15:49:16 UTC (rev 31893)
@@ -74,9 +74,8 @@
leaderHandle = examToHandle.getExamHandle();
}
} else {
- workingMemory.modifyRetract(examToHandle.getExamHandle());
examToHandle.getExam().setPeriod(period);
- workingMemory.modifyInsert(examToHandle.getExamHandle(), examToHandle.getExam());
+ workingMemory.update(examToHandle.getExamHandle(), examToHandle.getExam());
}
}
Score score = localSearchSolverScope.calculateScoreFromWorkingMemory();
@@ -115,14 +114,12 @@
break;
}
for (ExamToHandle examToHandle : examToHandleList) {
- workingMemory.modifyRetract(examToHandle.getExamHandle());
examToHandle.getExam().setPeriod(periodScoring.getPeriod());
- workingMemory.modifyInsert(examToHandle.getExamHandle(), examToHandle.getExam());
+ workingMemory.update(examToHandle.getExamHandle(), examToHandle.getExam());
}
for (Room room : roomList) {
- workingMemory.modifyRetract(leaderHandle);
leader.setRoom(room);
- workingMemory.modifyInsert(leaderHandle, leader);
+ workingMemory.update(leaderHandle, leader);
Score score = localSearchSolverScope.calculateScoreFromWorkingMemory();
if (score.compareTo(unscheduledScore) < 0) {
if (score.compareTo(bestScore) > 0) {
@@ -147,13 +144,11 @@
throw new IllegalStateException("The bestPeriod (" + bestPeriod + ") or the bestRoom ("
+ bestRoom + ") cannot be null.");
}
- workingMemory.modifyRetract(leaderHandle);
leader.setRoom(bestRoom);
- workingMemory.modifyInsert(leaderHandle, leader);
+ workingMemory.update(leaderHandle, leader);
for (ExamToHandle examToHandle : examToHandleList) {
- workingMemory.modifyRetract(examToHandle.getExamHandle());
examToHandle.getExam().setPeriod(bestPeriod);
- workingMemory.modifyInsert(examToHandle.getExamHandle(), examToHandle.getExam());
+ workingMemory.update(examToHandle.getExamHandle(), examToHandle.getExam());
}
}
logger.debug(" Exam ({}) initialized for starting solution.", leader);
@@ -170,9 +165,8 @@
Score bestScore = DefaultHardAndSoftScore.valueOf(Integer.MIN_VALUE, Integer.MIN_VALUE);
Room bestRoom = null;
for (Room room : roomList) {
- workingMemory.modifyRetract(examHandle);
exam.setRoom(room);
- workingMemory.modifyInsert(examHandle, exam);
+ workingMemory.update(examHandle, exam);
Score score = localSearchSolverScope.calculateScoreFromWorkingMemory();
if (score.compareTo(unscheduledScore) < 0) {
if (score.compareTo(bestScore) > 0) {
@@ -192,9 +186,8 @@
throw new IllegalStateException("The bestRoom ("
+ bestRoom + ") cannot be null.");
}
- workingMemory.modifyRetract(examHandle);
exam.setRoom(bestRoom);
- workingMemory.modifyInsert(examHandle, exam);
+ workingMemory.update(examHandle, exam);
}
logger.debug(" Exam ({}) initialized for starting solution. *", exam);
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/solver/move/TimeslotChangeMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/solver/move/TimeslotChangeMove.java 2010-03-01 15:46:54 UTC (rev 31892)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/solver/move/TimeslotChangeMove.java 2010-03-01 15:49:16 UTC (rev 31893)
@@ -36,9 +36,8 @@
public void doMove(WorkingMemory workingMemory) {
FactHandle lessonHandle = workingMemory.getFactHandle(lesson);
- workingMemory.modifyRetract(lessonHandle);
lesson.setTimeslot(toTimeslot);
- workingMemory.modifyInsert(lessonHandle, lesson);
+ workingMemory.update(lessonHandle, lesson);
}
public Collection<? extends Object> getTabuProperties() {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/solver/solution/initializer/Manners2009StartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/solver/solution/initializer/Manners2009StartingSolutionInitializer.java 2010-03-01 15:46:54 UTC (rev 31892)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/solver/solution/initializer/Manners2009StartingSolutionInitializer.java 2010-03-01 15:49:16 UTC (rev 31893)
@@ -51,9 +51,8 @@
seatDesignation.setSeat(seat);
seatDesignationHandle = workingMemory.insert(seatDesignation);
} else {
- workingMemory.modifyRetract(seatDesignationHandle);
seatDesignation.setSeat(seat);
- workingMemory.modifyInsert(seatDesignationHandle, seatDesignation);
+ workingMemory.update(seatDesignationHandle, seatDesignation);
}
Score score = localSearchSolverScope.calculateScoreFromWorkingMemory();
if (score.compareTo(bestScore) > 0) {
@@ -65,9 +64,8 @@
if (bestSeat == null) {
throw new IllegalStateException("The bestSeat (" + bestSeat + ") cannot be null.");
}
- workingMemory.modifyRetract(seatDesignationHandle);
seatDesignation.setSeat(bestSeat);
- workingMemory.modifyInsert(seatDesignationHandle, seatDesignation);
+ workingMemory.update(seatDesignationHandle, seatDesignation);
// There will always be enough allowed seats: ok to do this for this problem, but not ok for most problems
undesignatedSeatList.remove(bestSeat);
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/solver/move/YChangeMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/solver/move/YChangeMove.java 2010-03-01 15:46:54 UTC (rev 31892)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/solver/move/YChangeMove.java 2010-03-01 15:49:16 UTC (rev 31893)
@@ -34,9 +34,8 @@
public void doMove(WorkingMemory workingMemory) {
FactHandle queenHandle = workingMemory.getFactHandle(queen);
- workingMemory.modifyRetract(queenHandle); // before changes are made
queen.setY(toY);
- workingMemory.modifyInsert(queenHandle, queen); // after changes are made
+ workingMemory.update(queenHandle, queen); // after changes are made
}
public Collection<? extends Object> getTabuProperties() {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/solver/solution/initializer/PatientAdmissionScheduleStartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/solver/solution/initializer/PatientAdmissionScheduleStartingSolutionInitializer.java 2010-03-01 15:46:54 UTC (rev 31892)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/solver/solution/initializer/PatientAdmissionScheduleStartingSolutionInitializer.java 2010-03-01 15:49:16 UTC (rev 31893)
@@ -83,9 +83,8 @@
bedDesignation.setBed(bed);
bedDesignationHandle = workingMemory.insert(bedDesignation);
} else {
- workingMemory.modifyRetract(bedDesignationHandle);
bedDesignation.setBed(bed);
- workingMemory.modifyInsert(bedDesignationHandle, bedDesignation);
+ workingMemory.update(bedDesignationHandle, bedDesignation);
}
Score score = localSearchSolverScope.calculateScoreFromWorkingMemory();
if (score.compareTo(unscheduledScore) < 0) {
@@ -134,9 +133,8 @@
}
}
if (!perfectMatch) {
- workingMemory.modifyRetract(bedDesignationHandle);
bedDesignation.setBed(bestBed);
- workingMemory.modifyInsert(bedDesignationHandle, bedDesignation);
+ workingMemory.update(bedDesignationHandle, bedDesignation);
}
// put the occupied bed at the end of the list
bedListInPriority.remove(bestBed);
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/solver/simple/move/DayChangeMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/solver/simple/move/DayChangeMove.java 2010-03-01 15:46:54 UTC (rev 31892)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/solver/simple/move/DayChangeMove.java 2010-03-01 15:49:16 UTC (rev 31893)
@@ -36,9 +36,8 @@
public void doMove(WorkingMemory workingMemory) {
FactHandle matchHandle = workingMemory.getFactHandle(match);
- workingMemory.modifyRetract(matchHandle);
match.setDay(toDay);
- workingMemory.modifyInsert(matchHandle, match);
+ workingMemory.update(matchHandle, match);
}
public Collection<? extends Object> getTabuProperties() {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/solver/smart/move/MatchSwapMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/solver/smart/move/MatchSwapMove.java 2010-03-01 15:46:54 UTC (rev 31892)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/solver/smart/move/MatchSwapMove.java 2010-03-01 15:49:16 UTC (rev 31893)
@@ -37,12 +37,10 @@
Day oldFirstMatchDay = firstMatch.getDay();
FactHandle firstMatchHandle = workingMemory.getFactHandle(firstMatch);
FactHandle secondMatchHandle = workingMemory.getFactHandle(secondMatch);
- workingMemory.modifyRetract(firstMatchHandle);
- workingMemory.modifyRetract(secondMatchHandle);
firstMatch.setDay(secondMatch.getDay());
secondMatch.setDay(oldFirstMatchDay);
- workingMemory.modifyInsert(firstMatchHandle, firstMatch);
- workingMemory.modifyInsert(secondMatchHandle, secondMatch);
+ workingMemory.update(firstMatchHandle, firstMatch);
+ workingMemory.update(secondMatchHandle, secondMatch);
}
public Collection<? extends Object> getTabuProperties() {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/solver/smart/move/MultipleMatchListRotateMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/solver/smart/move/MultipleMatchListRotateMove.java 2010-03-01 15:46:54 UTC (rev 31892)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/solver/smart/move/MultipleMatchListRotateMove.java 2010-03-01 15:49:16 UTC (rev 31893)
@@ -55,15 +55,13 @@
while (it.hasNext()) {
secondMatch = it.next();
FactHandle firstMatchHandle = workingMemory.getFactHandle(firstMatch);
- workingMemory.modifyRetract(firstMatchHandle);
firstMatch.setDay(secondMatch.getDay());
- workingMemory.modifyInsert(firstMatchHandle, firstMatch);
+ workingMemory.update(firstMatchHandle, firstMatch);
firstMatch = secondMatch;
}
FactHandle secondMatchHandle = workingMemory.getFactHandle(firstMatch);
- workingMemory.modifyRetract(secondMatchHandle);
secondMatch.setDay(startDay);
- workingMemory.modifyInsert(secondMatchHandle, secondMatch);
+ workingMemory.update(secondMatchHandle, secondMatch);
}
public Collection<? extends Object> getTabuProperties() {
More information about the jboss-svn-commits
mailing list