[jboss-svn-commits] JBL Code SVN: r19194 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main: java/org/drools/solver/examples/itc2007/curriculumcourse/solver/solution/initializer and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 21 17:00:01 EDT 2008
Author: ge0ffrey
Date: 2008-03-21 17:00:01 -0400 (Fri, 21 Mar 2008)
New Revision: 19194
Added:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/factory/LectureSwitchMoveFactory.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/factory/PeriodChangeMoveFactory.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/factory/RoomChangeMoveFactory.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/ExamSwitchMoveFactory.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/PeriodChangeMoveFactory.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/RoomChangeMoveFactory.java
Removed:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/ExamSwitchExaminationMoveFactory.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/PeriodChangeExaminationMoveFactory.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/RoomChangeExaminationMoveFactory.java
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/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationSolverConfig.xml
Log:
curriculumcourse move factory
Copied: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/factory/LectureSwitchMoveFactory.java (from rev 19190, labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/ExamSwitchExaminationMoveFactory.java)
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/factory/LectureSwitchMoveFactory.java (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/factory/LectureSwitchMoveFactory.java 2008-03-21 21:00:01 UTC (rev 19194)
@@ -0,0 +1,33 @@
+package org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.drools.solver.core.move.Move;
+import org.drools.solver.core.move.factory.CachedMoveFactory;
+import org.drools.solver.core.solution.Solution;
+import org.drools.solver.examples.itc2007.curriculumcourse.domain.CurriculumCourseSchedule;
+import org.drools.solver.examples.itc2007.curriculumcourse.domain.Lecture;
+import org.drools.solver.examples.itc2007.curriculumcourse.solver.move.LectureSwitchMove;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class LectureSwitchMoveFactory extends CachedMoveFactory {
+
+ public List<Move> createCachedMoveList(Solution solution) {
+ CurriculumCourseSchedule schedule = (CurriculumCourseSchedule) localSearchSolver.getCurrentSolution();
+ List<Lecture> lectureList = schedule.getLectureList();
+ List<Move> moveList = new ArrayList<Move>();
+ for (ListIterator<Lecture> leftIt = lectureList.listIterator(); leftIt.hasNext();) {
+ Lecture leftLecture = leftIt.next();
+ for (ListIterator<Lecture> rightIt = lectureList.listIterator(leftIt.nextIndex()); rightIt.hasNext();) {
+ Lecture rightLecture = rightIt.next();
+ moveList.add(new LectureSwitchMove(leftLecture, rightLecture));
+ }
+ }
+ return moveList;
+ }
+
+}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/factory/PeriodChangeMoveFactory.java (from rev 19190, labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/PeriodChangeExaminationMoveFactory.java)
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/factory/PeriodChangeMoveFactory.java (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/factory/PeriodChangeMoveFactory.java 2008-03-21 21:00:01 UTC (rev 19194)
@@ -0,0 +1,31 @@
+package org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.drools.solver.core.move.Move;
+import org.drools.solver.core.move.factory.CachedMoveFactory;
+import org.drools.solver.core.solution.Solution;
+import org.drools.solver.examples.itc2007.curriculumcourse.domain.CurriculumCourseSchedule;
+import org.drools.solver.examples.itc2007.curriculumcourse.domain.Lecture;
+import org.drools.solver.examples.itc2007.curriculumcourse.domain.Period;
+import org.drools.solver.examples.itc2007.curriculumcourse.solver.move.PeriodChangeMove;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class PeriodChangeMoveFactory extends CachedMoveFactory {
+
+ public List<Move> createCachedMoveList(Solution solution) {
+ CurriculumCourseSchedule schedule = (CurriculumCourseSchedule) solution;
+ List<Period> periodList = schedule.getPeriodList();
+ List<Move> moveList = new ArrayList<Move>();
+ for (Lecture lecture : schedule.getLectureList()) {
+ for (Period period : periodList) {
+ moveList.add(new PeriodChangeMove(lecture, period));
+ }
+ }
+ return moveList;
+ }
+
+}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/factory/RoomChangeMoveFactory.java (from rev 19190, labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/RoomChangeExaminationMoveFactory.java)
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/factory/RoomChangeMoveFactory.java (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/factory/RoomChangeMoveFactory.java 2008-03-21 21:00:01 UTC (rev 19194)
@@ -0,0 +1,31 @@
+package org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.drools.solver.core.move.Move;
+import org.drools.solver.core.move.factory.CachedMoveFactory;
+import org.drools.solver.core.solution.Solution;
+import org.drools.solver.examples.itc2007.curriculumcourse.domain.CurriculumCourseSchedule;
+import org.drools.solver.examples.itc2007.curriculumcourse.domain.Lecture;
+import org.drools.solver.examples.itc2007.curriculumcourse.domain.Room;
+import org.drools.solver.examples.itc2007.curriculumcourse.solver.move.RoomChangeMove;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class RoomChangeMoveFactory extends CachedMoveFactory {
+
+ public List<Move> createCachedMoveList(Solution solution) {
+ CurriculumCourseSchedule schedule = (CurriculumCourseSchedule) solution;
+ List<Room> roomList = schedule.getRoomList();
+ List<Move> moveList = new ArrayList<Move>();
+ for (Lecture lecture : schedule.getLectureList()) {
+ for (Room room : roomList) {
+ moveList.add(new RoomChangeMove(lecture, room));
+ }
+ }
+ return moveList;
+ }
+
+}
\ No newline at end of file
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-03-21 20:42:25 UTC (rev 19193)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/solution/initializer/CurriculumCourseStartingSolutionInitializer.java 2008-03-21 21:00:01 UTC (rev 19194)
@@ -44,6 +44,7 @@
for (Lecture lecture : lectureList) {
lecture.setPeriod(periodList.get(tmp % periodList.size()));
lecture.setRoom(roomList.get(tmp % roomList.size()));
+ workingMemory.insert(lecture);
tmp++;
}
Deleted: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/ExamSwitchExaminationMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/ExamSwitchExaminationMoveFactory.java 2008-03-21 20:42:25 UTC (rev 19193)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/ExamSwitchExaminationMoveFactory.java 2008-03-21 21:00:01 UTC (rev 19194)
@@ -1,33 +0,0 @@
-package org.drools.solver.examples.itc2007.examination.solver.move.factory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.drools.solver.core.move.Move;
-import org.drools.solver.core.move.factory.CachedMoveFactory;
-import org.drools.solver.core.solution.Solution;
-import org.drools.solver.examples.itc2007.examination.domain.Exam;
-import org.drools.solver.examples.itc2007.examination.domain.Examination;
-import org.drools.solver.examples.itc2007.examination.solver.move.ExamSwitchMove;
-
-/**
- * @author Geoffrey De Smet
- */
-public class ExamSwitchExaminationMoveFactory extends CachedMoveFactory {
-
- public List<Move> createCachedMoveList(Solution solution) {
- Examination examination = (Examination) localSearchSolver.getCurrentSolution();
- List<Exam> examList = examination.getExamList();
- List<Move> moveList = new ArrayList<Move>();
- for (ListIterator<Exam> leftIt = examList.listIterator(); leftIt.hasNext();) {
- Exam leftExam = leftIt.next();
- for (ListIterator<Exam> rightIt = examList.listIterator(leftIt.nextIndex()); rightIt.hasNext();) {
- Exam rightExam = rightIt.next();
- moveList.add(new ExamSwitchMove(leftExam, rightExam));
- }
- }
- return moveList;
- }
-
-}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/ExamSwitchMoveFactory.java (from rev 19190, labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/ExamSwitchExaminationMoveFactory.java)
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/ExamSwitchMoveFactory.java (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/ExamSwitchMoveFactory.java 2008-03-21 21:00:01 UTC (rev 19194)
@@ -0,0 +1,33 @@
+package org.drools.solver.examples.itc2007.examination.solver.move.factory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.drools.solver.core.move.Move;
+import org.drools.solver.core.move.factory.CachedMoveFactory;
+import org.drools.solver.core.solution.Solution;
+import org.drools.solver.examples.itc2007.examination.domain.Exam;
+import org.drools.solver.examples.itc2007.examination.domain.Examination;
+import org.drools.solver.examples.itc2007.examination.solver.move.ExamSwitchMove;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class ExamSwitchMoveFactory extends CachedMoveFactory {
+
+ public List<Move> createCachedMoveList(Solution solution) {
+ Examination examination = (Examination) localSearchSolver.getCurrentSolution();
+ List<Exam> examList = examination.getExamList();
+ List<Move> moveList = new ArrayList<Move>();
+ for (ListIterator<Exam> leftIt = examList.listIterator(); leftIt.hasNext();) {
+ Exam leftExam = leftIt.next();
+ for (ListIterator<Exam> rightIt = examList.listIterator(leftIt.nextIndex()); rightIt.hasNext();) {
+ Exam rightExam = rightIt.next();
+ moveList.add(new ExamSwitchMove(leftExam, rightExam));
+ }
+ }
+ return moveList;
+ }
+
+}
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/PeriodChangeExaminationMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/PeriodChangeExaminationMoveFactory.java 2008-03-21 20:42:25 UTC (rev 19193)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/PeriodChangeExaminationMoveFactory.java 2008-03-21 21:00:01 UTC (rev 19194)
@@ -1,33 +0,0 @@
-package org.drools.solver.examples.itc2007.examination.solver.move.factory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.drools.solver.core.move.Move;
-import org.drools.solver.core.move.factory.CachedMoveFactory;
-import org.drools.solver.core.solution.Solution;
-import org.drools.solver.examples.itc2007.examination.domain.Exam;
-import org.drools.solver.examples.itc2007.examination.domain.Examination;
-import org.drools.solver.examples.itc2007.examination.domain.Period;
-import org.drools.solver.examples.itc2007.examination.solver.move.PeriodChangeMove;
-
-/**
- * @author Geoffrey De Smet
- */
-public class PeriodChangeExaminationMoveFactory extends CachedMoveFactory {
-
- public List<Move> createCachedMoveList(Solution solution) {
- Examination examination = (Examination) solution;
- List<Period> periodList = examination.getPeriodList();
- List<Move> moveList = new ArrayList<Move>();
- for (Exam exam : examination.getExamList()) {
- if (exam.isCoincidenceLeader()) {
- for (Period period : periodList) {
- moveList.add(new PeriodChangeMove(exam, period));
- }
- }
- }
- return moveList;
- }
-
-}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/PeriodChangeMoveFactory.java (from rev 19190, labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/PeriodChangeExaminationMoveFactory.java)
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/PeriodChangeMoveFactory.java (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/PeriodChangeMoveFactory.java 2008-03-21 21:00:01 UTC (rev 19194)
@@ -0,0 +1,33 @@
+package org.drools.solver.examples.itc2007.examination.solver.move.factory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.drools.solver.core.move.Move;
+import org.drools.solver.core.move.factory.CachedMoveFactory;
+import org.drools.solver.core.solution.Solution;
+import org.drools.solver.examples.itc2007.examination.domain.Exam;
+import org.drools.solver.examples.itc2007.examination.domain.Examination;
+import org.drools.solver.examples.itc2007.examination.domain.Period;
+import org.drools.solver.examples.itc2007.examination.solver.move.PeriodChangeMove;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class PeriodChangeMoveFactory extends CachedMoveFactory {
+
+ public List<Move> createCachedMoveList(Solution solution) {
+ Examination examination = (Examination) solution;
+ List<Period> periodList = examination.getPeriodList();
+ List<Move> moveList = new ArrayList<Move>();
+ for (Exam exam : examination.getExamList()) {
+ if (exam.isCoincidenceLeader()) {
+ for (Period period : periodList) {
+ moveList.add(new PeriodChangeMove(exam, period));
+ }
+ }
+ }
+ return moveList;
+ }
+
+}
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/RoomChangeExaminationMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/RoomChangeExaminationMoveFactory.java 2008-03-21 20:42:25 UTC (rev 19193)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/RoomChangeExaminationMoveFactory.java 2008-03-21 21:00:01 UTC (rev 19194)
@@ -1,31 +0,0 @@
-package org.drools.solver.examples.itc2007.examination.solver.move.factory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.drools.solver.core.move.Move;
-import org.drools.solver.core.move.factory.CachedMoveFactory;
-import org.drools.solver.core.solution.Solution;
-import org.drools.solver.examples.itc2007.examination.domain.Exam;
-import org.drools.solver.examples.itc2007.examination.domain.Examination;
-import org.drools.solver.examples.itc2007.examination.domain.Room;
-import org.drools.solver.examples.itc2007.examination.solver.move.RoomChangeMove;
-
-/**
- * @author Geoffrey De Smet
- */
-public class RoomChangeExaminationMoveFactory extends CachedMoveFactory {
-
- public List<Move> createCachedMoveList(Solution solution) {
- Examination examination = (Examination) solution;
- List<Room> roomList = examination.getRoomList();
- List<Move> moveList = new ArrayList<Move>();
- for (Exam exam : examination.getExamList()) {
- for (Room room : roomList) {
- moveList.add(new RoomChangeMove(exam, room));
- }
- }
- return moveList;
- }
-
-}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/RoomChangeMoveFactory.java (from rev 19190, labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/RoomChangeExaminationMoveFactory.java)
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/RoomChangeMoveFactory.java (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/factory/RoomChangeMoveFactory.java 2008-03-21 21:00:01 UTC (rev 19194)
@@ -0,0 +1,31 @@
+package org.drools.solver.examples.itc2007.examination.solver.move.factory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.drools.solver.core.move.Move;
+import org.drools.solver.core.move.factory.CachedMoveFactory;
+import org.drools.solver.core.solution.Solution;
+import org.drools.solver.examples.itc2007.examination.domain.Exam;
+import org.drools.solver.examples.itc2007.examination.domain.Examination;
+import org.drools.solver.examples.itc2007.examination.domain.Room;
+import org.drools.solver.examples.itc2007.examination.solver.move.RoomChangeMove;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class RoomChangeMoveFactory extends CachedMoveFactory {
+
+ public List<Move> createCachedMoveList(Solution solution) {
+ Examination examination = (Examination) solution;
+ List<Room> roomList = examination.getRoomList();
+ List<Move> moveList = new ArrayList<Move>();
+ for (Exam exam : examination.getExamList()) {
+ for (Room room : roomList) {
+ moveList.add(new RoomChangeMove(exam, room));
+ }
+ }
+ return moveList;
+ }
+
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml 2008-03-21 20:42:25 UTC (rev 19193)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml 2008-03-21 21:00:01 UTC (rev 19194)
@@ -11,7 +11,7 @@
ge0ffrey's main pc: 429
ge0ffrey's old pc: 1152
-->
- <maximumSecondsSpend>1</maximumSecondsSpend>
+ <maximumSecondsSpend>30</maximumSecondsSpend>
<!--<feasableScore>-999999.0</feasableScore>-->
<!--<maximumStepCount>100</maximumStepCount>-->
</finish>
@@ -19,18 +19,18 @@
<selector>
<topSize>10</topSize>
</selector>
- <!--<selector>-->
- <!--<moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.PeriodChangeExaminationMoveFactory</moveFactoryClass>-->
- <!--<relativeSelection>0.002</relativeSelection>-->
- <!--</selector>-->
- <!--<selector>-->
- <!--<moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.RoomChangeExaminationMoveFactory</moveFactoryClass>-->
- <!--<relativeSelection>0.002</relativeSelection>-->
- <!--</selector>-->
- <!--<selector>-->
- <!--<moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.ExamSwitchExaminationMoveFactory</moveFactoryClass>-->
- <!--<relativeSelection>0.002</relativeSelection>-->
- <!--</selector>-->
+ <selector>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory.LectureSwitchMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
+ </selector>
</selector>
<accepter>
<completeSolutionTabuSize>1500</completeSolutionTabuSize>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml 2008-03-21 20:42:25 UTC (rev 19193)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml 2008-03-21 21:00:01 UTC (rev 19194)
@@ -24,15 +24,15 @@
<topSize>10</topSize>
</selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.PeriodChangeExaminationMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.RoomChangeExaminationMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.ExamSwitchExaminationMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
</selector>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml 2008-03-21 20:42:25 UTC (rev 19193)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml 2008-03-21 21:00:01 UTC (rev 19194)
@@ -40,15 +40,15 @@
<topSize>10</topSize>
</selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.PeriodChangeExaminationMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.RoomChangeExaminationMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.ExamSwitchExaminationMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
</selector>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationSolverConfig.xml 2008-03-21 20:42:25 UTC (rev 19193)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationSolverConfig.xml 2008-03-21 21:00:01 UTC (rev 19194)
@@ -20,15 +20,15 @@
<topSize>10</topSize>
</selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.PeriodChangeExaminationMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.RoomChangeExaminationMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.ExamSwitchExaminationMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
</selector>
More information about the jboss-svn-commits
mailing list