[jboss-svn-commits] JBL Code SVN: r23705 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples: itc2007/curriculumcourse/solver/solution/initializer and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 4 22:18:16 EST 2008
Author: mark.proctor at jboss.com
Date: 2008-11-04 22:18:16 -0500 (Tue, 04 Nov 2008)
New Revision: 23705
Modified:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/CurriculumCourseMoveHelper.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/solution/initializer/CurriculumCourseStartingSolutionInitializer.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/ExaminationMoveHelper.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/lessonschedule/solver/move/TimeslotChangeMove.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/nqueens/solver/move/YChangeMove.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/simple/move/DayChangeMove.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MatchSwapMove.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MultipleMatchListRotateMove.java
Log:
JBRULES-1734 Drools API
-fixed solver related api issues.
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/CurriculumCourseMoveHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/CurriculumCourseMoveHelper.java 2008-11-05 02:46:21 UTC (rev 23704)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/CurriculumCourseMoveHelper.java 2008-11-05 03:18:16 UTC (rev 23705)
@@ -14,24 +14,21 @@
public static void movePeriod(WorkingMemory workingMemory, Lecture lecture, Period period) {
FactHandle factHandle = workingMemory.getFactHandle(lecture);
- workingMemory.modifyRetract(factHandle);
lecture.setPeriod(period);
- workingMemory.modifyInsert(factHandle, lecture);
+ workingMemory.update(factHandle, lecture);
}
public static void moveRoom(WorkingMemory workingMemory, Lecture lecture, Room room) {
FactHandle factHandle = workingMemory.getFactHandle(lecture);
- workingMemory.modifyRetract(factHandle);
lecture.setRoom(room);
- workingMemory.modifyInsert(factHandle, lecture);
+ workingMemory.update(factHandle, lecture);
}
public static void moveLecture(WorkingMemory workingMemory, Lecture lecture, Period period, Room room) {
FactHandle factHandle = workingMemory.getFactHandle(lecture);
- workingMemory.modifyRetract(factHandle);
lecture.setPeriod(period);
lecture.setRoom(room);
- workingMemory.modifyInsert(factHandle, lecture);
+ workingMemory.update(factHandle, lecture);
}
private CurriculumCourseMoveHelper() {
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/solution/initializer/CurriculumCourseStartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/solution/initializer/CurriculumCourseStartingSolutionInitializer.java 2008-11-05 02:46:21 UTC (rev 23704)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/solution/initializer/CurriculumCourseStartingSolutionInitializer.java 2008-11-05 03:18:16 UTC (rev 23705)
@@ -50,9 +50,8 @@
lecture.setPeriod(period);
lectureHandle = workingMemory.insert(lecture);
} else {
- workingMemory.modifyRetract(lectureHandle);
lecture.setPeriod(period);
- workingMemory.modifyInsert(lectureHandle, lecture);
+ workingMemory.update(lectureHandle, lecture);
}
double score = localSearchSolverScope.calculateScoreFromWorkingMemory();
periodScoringList.add(new PeriodScoring(period, score));
@@ -68,14 +67,12 @@
// No need to check the rest
break;
}
- workingMemory.modifyRetract(lectureHandle);
lecture.setPeriod(periodScoring.getPeriod());
- workingMemory.modifyInsert(lectureHandle, lecture);
+ workingMemory.update(lectureHandle, lecture);
for (Room room : roomList) {
- workingMemory.modifyRetract(lectureHandle);
lecture.setRoom(room);
- workingMemory.modifyInsert(lectureHandle, lecture);
+ workingMemory.update(lectureHandle, lecture);
double score = localSearchSolverScope.calculateScoreFromWorkingMemory();
if (score < unscheduledScore) {
if (score > bestScore) {
@@ -99,10 +96,9 @@
throw new IllegalStateException("The bestPeriod (" + bestPeriod + ") or the bestRoom ("
+ bestRoom + ") cannot be null.");
}
- workingMemory.modifyRetract(lectureHandle);
lecture.setPeriod(bestPeriod);
lecture.setRoom(bestRoom);
- workingMemory.modifyInsert(lectureHandle, lecture);
+ workingMemory.update(lectureHandle, lecture);
}
logger.debug(" Lecture ({}) initialized for starting solution.", lecture);
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/ExaminationMoveHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/ExaminationMoveHelper.java 2008-11-05 02:46:21 UTC (rev 23704)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/ExaminationMoveHelper.java 2008-11-05 03:18:16 UTC (rev 23705)
@@ -13,25 +13,22 @@
public static void movePeriod(WorkingMemory workingMemory, Exam exam, Period period) {
FactHandle factHandle = workingMemory.getFactHandle(exam);
- workingMemory.modifyRetract(factHandle);
exam.setPeriod(period);
- workingMemory.modifyInsert(factHandle, exam);
+ workingMemory.update(factHandle, exam);
movePeriodCoincidene(workingMemory, exam, period);
}
public static void moveRoom(WorkingMemory workingMemory, Exam exam, Room room) {
FactHandle factHandle = workingMemory.getFactHandle(exam);
- workingMemory.modifyRetract(factHandle);
exam.setRoom(room);
- workingMemory.modifyInsert(factHandle, exam);
+ workingMemory.update(factHandle, exam);
}
public static void moveExam(WorkingMemory workingMemory, Exam exam, Period period, Room room) {
FactHandle factHandle = workingMemory.getFactHandle(exam);
- workingMemory.modifyRetract(factHandle);
exam.setPeriod(period);
exam.setRoom(room);
- workingMemory.modifyInsert(factHandle, exam);
+ workingMemory.update(factHandle, exam);
movePeriodCoincidene(workingMemory, exam, period);
}
@@ -39,10 +36,9 @@
if (exam.getExamCoincidence() != null) {
for (Exam coincidenceExam : exam.getExamCoincidence().getCoincidenceExamSet()) {
if (!exam.equals(coincidenceExam)) {
- FactHandle factHandle = workingMemory.getFactHandle(coincidenceExam);
- workingMemory.modifyRetract(factHandle);
+ FactHandle factHandle = workingMemory.getFactHandle(coincidenceExam);
coincidenceExam.setPeriod(period);
- workingMemory.modifyInsert(factHandle, coincidenceExam);
+ workingMemory.update(factHandle, coincidenceExam);
}
}
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java 2008-11-05 02:46:21 UTC (rev 23704)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java 2008-11-05 03:18:16 UTC (rev 23705)
@@ -10,7 +10,7 @@
import org.apache.commons.lang.builder.CompareToBuilder;
import org.drools.WorkingMemory;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.solver.core.localsearch.LocalSearchSolverScope;
import org.drools.solver.core.solution.initializer.AbstractStartingSolutionInitializer;
import org.drools.solver.examples.common.domain.PersistableIdComparator;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/lessonschedule/solver/move/TimeslotChangeMove.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/lessonschedule/solver/move/TimeslotChangeMove.java 2008-11-05 02:46:21 UTC (rev 23704)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/lessonschedule/solver/move/TimeslotChangeMove.java 2008-11-05 03:18:16 UTC (rev 23705)
@@ -7,7 +7,7 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.drools.WorkingMemory;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.solver.core.localsearch.decider.accepter.tabu.TabuPropertyEnabled;
import org.drools.solver.core.move.Move;
import org.drools.solver.examples.lessonschedule.domain.Lesson;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/nqueens/solver/move/YChangeMove.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/nqueens/solver/move/YChangeMove.java 2008-11-05 02:46:21 UTC (rev 23704)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/nqueens/solver/move/YChangeMove.java 2008-11-05 03:18:16 UTC (rev 23705)
@@ -6,7 +6,7 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.drools.WorkingMemory;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.solver.core.localsearch.decider.accepter.tabu.TabuPropertyEnabled;
import org.drools.solver.core.move.Move;
import org.drools.solver.examples.nqueens.domain.Queen;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/simple/move/DayChangeMove.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/simple/move/DayChangeMove.java 2008-11-05 02:46:21 UTC (rev 23704)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/simple/move/DayChangeMove.java 2008-11-05 03:18:16 UTC (rev 23705)
@@ -7,7 +7,7 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.drools.WorkingMemory;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.solver.core.localsearch.decider.accepter.tabu.TabuPropertyEnabled;
import org.drools.solver.core.move.Move;
import org.drools.solver.examples.travelingtournament.domain.Day;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MatchSwapMove.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MatchSwapMove.java 2008-11-05 02:46:21 UTC (rev 23704)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MatchSwapMove.java 2008-11-05 03:18:16 UTC (rev 23705)
@@ -6,7 +6,7 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.drools.WorkingMemory;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.solver.core.localsearch.decider.accepter.tabu.TabuPropertyEnabled;
import org.drools.solver.core.move.Move;
import org.drools.solver.examples.travelingtournament.domain.Day;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MultipleMatchListRotateMove.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MultipleMatchListRotateMove.java 2008-11-05 02:46:21 UTC (rev 23704)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MultipleMatchListRotateMove.java 2008-11-05 03:18:16 UTC (rev 23705)
@@ -9,7 +9,7 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.drools.WorkingMemory;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.solver.core.localsearch.decider.accepter.tabu.TabuPropertyEnabled;
import org.drools.solver.core.move.Move;
import org.drools.solver.examples.travelingtournament.domain.Day;
More information about the jboss-svn-commits
mailing list