[jboss-svn-commits] JBL Code SVN: r30777 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples: src/main/java/org/drools/planner/examples and 15 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Dec 20 07:34:07 EST 2009
Author: ge0ffrey
Date: 2009-12-20 07:34:06 -0500 (Sun, 20 Dec 2009)
New Revision: 30777
Added:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/
Removed:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/itc2007/examination/
Modified:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/benchmarkExamination.sh
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/app/ExamplesApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Exam.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Examination.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/InstitutionalWeighting.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Period.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/PeriodHardConstraint.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/PeriodHardConstraintType.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Room.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/RoomHardConstraint.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/RoomHardConstraintType.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Student.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Topic.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/solver/ExamBefore.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/solver/ExamCoincidence.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/solver/TopicConflict.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/persistence/ExaminationDaoImpl.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/persistence/ExaminationInputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/persistence/ExaminationOutputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/ExamSwitchMove.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/ExaminationMoveHelper.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/PeriodChangeMove.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/RoomChangeMove.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/ExamSwitchMoveFactory.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/JumpingNeighbourExaminationMoveFactory.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/NeighbourExaminationMoveFactory.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/PeriodChangeMoveFactory.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/RoomChangeMoveFactory.java
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/swingui/ExaminationPanel.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationShortSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationScoreRules.drl
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationSolverConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/solver/patientAdmissionScheduleBaseScoreRules.drl
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/solver/patientAdmissionScheduleSameBedInSameNightScoreRule.drl
Log:
shorten data files of examples: examination + remove itc2007 directory for examination
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/benchmarkExamination.sh
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/benchmarkExamination.sh 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/benchmarkExamination.sh 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,6 +1,6 @@
#!/bin/sh
-mainClass=org.drools.planner.examples.itc2007.examination.app.ExaminationBenchmarkApp
+mainClass=org.drools.planner.examples.examination.app.ExaminationBenchmarkApp
if [ $# -ge 1 ];
then
mvn exec:exec -Dexec.mainClass="${mainClass}" -Dexec.programArgs="$*"
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/app/ExamplesApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/app/ExamplesApp.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/app/ExamplesApp.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -5,7 +5,7 @@
import org.drools.planner.examples.nqueens.app.NQueensApp;
import org.drools.planner.examples.lessonschedule.app.LessonScheduleApp;
import org.drools.planner.examples.travelingtournament.app.smart.SmartTravelingTournamentApp;
-import org.drools.planner.examples.itc2007.examination.app.ExaminationApp;
+import org.drools.planner.examples.examination.app.ExaminationApp;
import org.drools.planner.examples.curriculumcourse.app.CurriculumCourseApp;
import org.drools.planner.examples.manners2009.app.Manners2009App;
Copied: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination (from rev 30776, labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination)
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/app/ExaminationApp.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationApp.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,13 +1,12 @@
-package org.drools.planner.examples.itc2007.examination.app;
+package org.drools.planner.examples.examination.app;
import org.drools.planner.config.XmlSolverConfigurer;
import org.drools.planner.core.Solver;
import org.drools.planner.examples.common.app.CommonApp;
import org.drools.planner.examples.common.persistence.SolutionDao;
import org.drools.planner.examples.common.swingui.SolutionPanel;
-import org.drools.planner.examples.itc2007.examination.persistence.ExaminationDaoImpl;
-import org.drools.planner.examples.itc2007.examination.swingui.ExaminationPanel;
-import org.drools.planner.examples.manners2009.persistence.Manners2009DaoImpl;
+import org.drools.planner.examples.examination.persistence.ExaminationDaoImpl;
+import org.drools.planner.examples.examination.swingui.ExaminationPanel;
/**
* @author Geoffrey De Smet
@@ -15,7 +14,7 @@
public class ExaminationApp extends CommonApp {
public static final String SOLVER_CONFIG
- = "/org/drools/planner/examples/itc2007/examination/solver/examinationSolverConfig.xml";
+ = "/org/drools/planner/examples/examination/solver/examinationSolverConfig.xml";
public static void main(String[] args) {
new ExaminationApp().init();
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/app/ExaminationBenchmarkApp.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationBenchmarkApp.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,9 +1,9 @@
-package org.drools.planner.examples.itc2007.examination.app;
+package org.drools.planner.examples.examination.app;
import java.io.File;
import org.drools.planner.examples.common.app.CommonBenchmarkApp;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
+import org.drools.planner.examples.examination.domain.Examination;
/**
* @author Geoffrey De Smet
@@ -11,11 +11,11 @@
public class ExaminationBenchmarkApp extends CommonBenchmarkApp {
public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
- = "/org/drools/planner/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml";
+ = "/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml";
public static final String SHORT_SOLVER_BENCHMARK_CONFIG
- = "/org/drools/planner/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml";
+ = "/org/drools/planner/examples/examination/benchmark/examinationShortSolverBenchmarkConfig.xml";
public static final File SOLVER_BENCHMARK_RESULT_FILE
- = new File("local/data/itc2007/examination/examinationSolverBenchmarkResult.xml");
+ = new File("local/data/examination/examinationSolverBenchmarkResult.xml");
public static void main(String[] args) {
String solverConfig;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Exam.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/Exam.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Exam.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,15 +1,17 @@
-package org.drools.planner.examples.itc2007.examination.domain;
+package org.drools.planner.examples.examination.domain;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.commons.lang.builder.CompareToBuilder;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.drools.planner.examples.common.domain.AbstractPersistable;
-import org.drools.planner.examples.itc2007.examination.domain.solver.ExamBefore;
-import org.drools.planner.examples.itc2007.examination.domain.solver.ExamCoincidence;
+import org.drools.planner.examples.examination.domain.solver.ExamBefore;
+import org.drools.planner.examples.examination.domain.solver.ExamCoincidence;
/**
* @author Geoffrey De Smet
*/
+ at XStreamAlias("Exam")
public class Exam extends AbstractPersistable implements Comparable<Exam> {
private Topic topic;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Examination.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/Examination.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Examination.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,20 +1,22 @@
-package org.drools.planner.examples.itc2007.examination.domain;
+package org.drools.planner.examples.examination.domain;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.drools.planner.core.solution.Solution;
import org.drools.planner.core.score.HardAndSoftScore;
import org.drools.planner.core.score.Score;
import org.drools.planner.examples.common.domain.AbstractPersistable;
-import org.drools.planner.examples.itc2007.examination.domain.solver.TopicConflict;
+import org.drools.planner.examples.examination.domain.solver.TopicConflict;
/**
* @author Geoffrey De Smet
*/
+ at XStreamAlias("Examination")
public class Examination extends AbstractPersistable implements Solution {
private InstitutionalWeighting institutionalWeighting;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/InstitutionalWeighting.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/InstitutionalWeighting.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/InstitutionalWeighting.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,11 +1,13 @@
-package org.drools.planner.examples.itc2007.examination.domain;
+package org.drools.planner.examples.examination.domain;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.commons.lang.builder.CompareToBuilder;
import org.drools.planner.examples.common.domain.AbstractPersistable;
/**
* @author Geoffrey De Smet
*/
+ at XStreamAlias("InstitutionalWeighting")
public class InstitutionalWeighting extends AbstractPersistable implements Comparable<InstitutionalWeighting> {
private int twoInARowPenality;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Period.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/Period.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Period.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,11 +1,13 @@
-package org.drools.planner.examples.itc2007.examination.domain;
+package org.drools.planner.examples.examination.domain;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.commons.lang.builder.CompareToBuilder;
import org.drools.planner.examples.common.domain.AbstractPersistable;
/**
* @author Geoffrey De Smet
*/
+ at XStreamAlias("Period")
public class Period extends AbstractPersistable implements Comparable<Period> {
private String startDateTimeString;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/PeriodHardConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/PeriodHardConstraint.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/PeriodHardConstraint.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,11 +1,13 @@
-package org.drools.planner.examples.itc2007.examination.domain;
+package org.drools.planner.examples.examination.domain;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.commons.lang.builder.CompareToBuilder;
import org.drools.planner.examples.common.domain.AbstractPersistable;
/**
* @author Geoffrey De Smet
*/
+ at XStreamAlias("PeriodHardConstraint")
public class PeriodHardConstraint extends AbstractPersistable implements Comparable<PeriodHardConstraint> {
private PeriodHardConstraintType periodHardConstraintType;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/PeriodHardConstraintType.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/PeriodHardConstraintType.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/PeriodHardConstraintType.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,8 +1,11 @@
-package org.drools.planner.examples.itc2007.examination.domain;
+package org.drools.planner.examples.examination.domain;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
/**
* @author Geoffrey De Smet
*/
+ at XStreamAlias("PeriodHardConstraintType")
public enum PeriodHardConstraintType {
EXAM_COINCIDENCE, // TODO rename to coincidence?
EXCLUSION,
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Room.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/Room.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Room.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,11 +1,13 @@
-package org.drools.planner.examples.itc2007.examination.domain;
+package org.drools.planner.examples.examination.domain;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.commons.lang.builder.CompareToBuilder;
import org.drools.planner.examples.common.domain.AbstractPersistable;
/**
* @author Geoffrey De Smet
*/
+ at XStreamAlias("Room")
public class Room extends AbstractPersistable implements Comparable<Room> {
private int capacity;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/RoomHardConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/RoomHardConstraint.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/RoomHardConstraint.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,11 +1,13 @@
-package org.drools.planner.examples.itc2007.examination.domain;
+package org.drools.planner.examples.examination.domain;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.commons.lang.builder.CompareToBuilder;
import org.drools.planner.examples.common.domain.AbstractPersistable;
/**
* @author Geoffrey De Smet
*/
+ at XStreamAlias("RoomHardConstraint")
public class RoomHardConstraint extends AbstractPersistable implements Comparable<RoomHardConstraint> {
private RoomHardConstraintType roomHardConstraintType;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/RoomHardConstraintType.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/RoomHardConstraintType.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/RoomHardConstraintType.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,8 +1,11 @@
-package org.drools.planner.examples.itc2007.examination.domain;
+package org.drools.planner.examples.examination.domain;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
/**
* @author Geoffrey De Smet
*/
+ at XStreamAlias("RoomHardConstraintType")
public enum RoomHardConstraintType {
ROOM_EXCLUSIVE,
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Student.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/Student.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Student.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,5 +1,6 @@
-package org.drools.planner.examples.itc2007.examination.domain;
+package org.drools.planner.examples.examination.domain;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.commons.lang.builder.CompareToBuilder;
import org.drools.planner.examples.common.domain.AbstractPersistable;
@@ -7,6 +8,7 @@
* Not used during score calculation, so not inserted into the working memory.
* @author Geoffrey De Smet
*/
+ at XStreamAlias("Student")
public class Student extends AbstractPersistable implements Comparable<Student> {
public int compareTo(Student other) {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Topic.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/Topic.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/Topic.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,14 +1,16 @@
-package org.drools.planner.examples.itc2007.examination.domain;
+package org.drools.planner.examples.examination.domain;
import java.util.List;
import java.util.Set;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.commons.lang.builder.CompareToBuilder;
import org.drools.planner.examples.common.domain.AbstractPersistable;
/**
* @author Geoffrey De Smet
*/
+ at XStreamAlias("Topic")
public class Topic extends AbstractPersistable implements Comparable<Topic> {
private int duration; // in minutes
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/solver/ExamBefore.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/solver/ExamBefore.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/solver/ExamBefore.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,9 +1,9 @@
-package org.drools.planner.examples.itc2007.examination.domain.solver;
+package org.drools.planner.examples.examination.domain.solver;
import java.io.Serializable;
import java.util.Set;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Exam;
/**
* Calculated during initialization, not used for score calculation, used for move creation.
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/solver/ExamCoincidence.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/solver/ExamCoincidence.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/solver/ExamCoincidence.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,9 +1,9 @@
-package org.drools.planner.examples.itc2007.examination.domain.solver;
+package org.drools.planner.examples.examination.domain.solver;
import java.io.Serializable;
import java.util.Set;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Exam;
/**
* Calculated during initialization, not used for score calculation, used for move creation.
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/solver/TopicConflict.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/domain/solver/TopicConflict.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/domain/solver/TopicConflict.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,11 +1,11 @@
-package org.drools.planner.examples.itc2007.examination.domain.solver;
+package org.drools.planner.examples.examination.domain.solver;
import java.io.Serializable;
import org.apache.commons.lang.builder.CompareToBuilder;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.drools.planner.examples.itc2007.examination.domain.Topic;
+import org.drools.planner.examples.examination.domain.Topic;
/**
* Calculated during initialization, not modified during score calculation.
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/persistence/ExaminationDaoImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/persistence/ExaminationDaoImpl.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/persistence/ExaminationDaoImpl.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,8 +1,7 @@
-package org.drools.planner.examples.itc2007.examination.persistence;
+package org.drools.planner.examples.examination.persistence;
import org.drools.planner.examples.common.persistence.XstreamSolutionDaoImpl;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
-import org.drools.planner.examples.manners2009.domain.Manners2009;
+import org.drools.planner.examples.examination.domain.Examination;
/**
* @author Geoffrey De Smet
@@ -10,7 +9,7 @@
public class ExaminationDaoImpl extends XstreamSolutionDaoImpl {
public ExaminationDaoImpl() {
- super("itc2007/examination", Examination.class);
+ super("examination", Examination.class);
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/persistence/ExaminationInputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/persistence/ExaminationInputConvertor.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/persistence/ExaminationInputConvertor.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.examination.persistence;
+package org.drools.planner.examples.examination.persistence;
import java.io.IOException;
import java.text.DateFormat;
@@ -16,17 +16,16 @@
import org.apache.commons.lang.builder.CompareToBuilder;
import org.drools.planner.core.solution.Solution;
import org.drools.planner.examples.common.persistence.AbstractInputConvertor;
-import org.drools.planner.examples.common.persistence.SolutionDao;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
-import org.drools.planner.examples.itc2007.examination.domain.InstitutionalWeighting;
-import org.drools.planner.examples.itc2007.examination.domain.Period;
-import org.drools.planner.examples.itc2007.examination.domain.PeriodHardConstraint;
-import org.drools.planner.examples.itc2007.examination.domain.PeriodHardConstraintType;
-import org.drools.planner.examples.itc2007.examination.domain.Room;
-import org.drools.planner.examples.itc2007.examination.domain.RoomHardConstraint;
-import org.drools.planner.examples.itc2007.examination.domain.RoomHardConstraintType;
-import org.drools.planner.examples.itc2007.examination.domain.Student;
-import org.drools.planner.examples.itc2007.examination.domain.Topic;
+import org.drools.planner.examples.examination.domain.Examination;
+import org.drools.planner.examples.examination.domain.InstitutionalWeighting;
+import org.drools.planner.examples.examination.domain.Period;
+import org.drools.planner.examples.examination.domain.PeriodHardConstraint;
+import org.drools.planner.examples.examination.domain.PeriodHardConstraintType;
+import org.drools.planner.examples.examination.domain.Room;
+import org.drools.planner.examples.examination.domain.RoomHardConstraint;
+import org.drools.planner.examples.examination.domain.RoomHardConstraintType;
+import org.drools.planner.examples.examination.domain.Student;
+import org.drools.planner.examples.examination.domain.Topic;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/persistence/ExaminationOutputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/persistence/ExaminationOutputConvertor.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/persistence/ExaminationOutputConvertor.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,13 +1,12 @@
-package org.drools.planner.examples.itc2007.examination.persistence;
+package org.drools.planner.examples.examination.persistence;
import java.io.IOException;
import java.util.Collections;
import org.drools.planner.examples.common.domain.PersistableIdComparator;
import org.drools.planner.examples.common.persistence.AbstractOutputConvertor;
-import org.drools.planner.examples.common.persistence.SolutionDao;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
+import org.drools.planner.examples.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Examination;
import org.drools.planner.core.solution.Solution;
/**
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/ExamSwitchMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/solver/move/ExamSwitchMove.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/ExamSwitchMove.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.examination.solver.move;
+package org.drools.planner.examples.examination.solver.move;
import java.util.Arrays;
import java.util.Collection;
@@ -9,9 +9,9 @@
import org.drools.WorkingMemory;
import org.drools.planner.core.localsearch.decider.accepter.tabu.TabuPropertyEnabled;
import org.drools.planner.core.move.Move;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
-import org.drools.planner.examples.itc2007.examination.domain.Period;
-import org.drools.planner.examples.itc2007.examination.domain.Room;
+import org.drools.planner.examples.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Period;
+import org.drools.planner.examples.examination.domain.Room;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/ExaminationMoveHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/solver/move/ExaminationMoveHelper.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/ExaminationMoveHelper.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,10 +1,10 @@
-package org.drools.planner.examples.itc2007.examination.solver.move;
+package org.drools.planner.examples.examination.solver.move;
import org.drools.WorkingMemory;
import org.drools.runtime.rule.FactHandle;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
-import org.drools.planner.examples.itc2007.examination.domain.Period;
-import org.drools.planner.examples.itc2007.examination.domain.Room;
+import org.drools.planner.examples.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Period;
+import org.drools.planner.examples.examination.domain.Room;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/PeriodChangeMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/solver/move/PeriodChangeMove.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/PeriodChangeMove.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.examination.solver.move;
+package org.drools.planner.examples.examination.solver.move;
import java.util.Collection;
import java.util.Collections;
@@ -9,8 +9,8 @@
import org.drools.WorkingMemory;
import org.drools.planner.core.localsearch.decider.accepter.tabu.TabuPropertyEnabled;
import org.drools.planner.core.move.Move;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
-import org.drools.planner.examples.itc2007.examination.domain.Period;
+import org.drools.planner.examples.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Period;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/RoomChangeMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/solver/move/RoomChangeMove.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/RoomChangeMove.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.examination.solver.move;
+package org.drools.planner.examples.examination.solver.move;
import java.util.Collection;
import java.util.Collections;
@@ -9,8 +9,8 @@
import org.drools.WorkingMemory;
import org.drools.planner.core.localsearch.decider.accepter.tabu.TabuPropertyEnabled;
import org.drools.planner.core.move.Move;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
-import org.drools.planner.examples.itc2007.examination.domain.Room;
+import org.drools.planner.examples.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Room;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/ExamSwitchMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/solver/move/factory/ExamSwitchMoveFactory.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/ExamSwitchMoveFactory.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.examination.solver.move.factory;
+package org.drools.planner.examples.examination.solver.move.factory;
import java.util.ArrayList;
import java.util.List;
@@ -7,9 +7,9 @@
import org.drools.planner.core.move.Move;
import org.drools.planner.core.move.factory.CachedMoveFactory;
import org.drools.planner.core.solution.Solution;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
-import org.drools.planner.examples.itc2007.examination.solver.move.ExamSwitchMove;
+import org.drools.planner.examples.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Examination;
+import org.drools.planner.examples.examination.solver.move.ExamSwitchMove;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/JumpingNeighbourExaminationMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/solver/move/factory/JumpingNeighbourExaminationMoveFactory.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/JumpingNeighbourExaminationMoveFactory.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.examination.solver.move.factory;
+package org.drools.planner.examples.examination.solver.move.factory;
import java.util.ArrayList;
import java.util.List;
@@ -6,12 +6,12 @@
import org.drools.planner.core.move.Move;
import org.drools.planner.core.move.factory.AbstractMoveFactory;
import org.drools.planner.core.solution.Solution;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
-import org.drools.planner.examples.itc2007.examination.domain.Period;
-import org.drools.planner.examples.itc2007.examination.domain.Room;
-import org.drools.planner.examples.itc2007.examination.solver.move.PeriodChangeMove;
-import org.drools.planner.examples.itc2007.examination.solver.move.RoomChangeMove;
+import org.drools.planner.examples.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Examination;
+import org.drools.planner.examples.examination.domain.Period;
+import org.drools.planner.examples.examination.domain.Room;
+import org.drools.planner.examples.examination.solver.move.PeriodChangeMove;
+import org.drools.planner.examples.examination.solver.move.RoomChangeMove;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/NeighbourExaminationMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/solver/move/factory/NeighbourExaminationMoveFactory.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/NeighbourExaminationMoveFactory.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.examination.solver.move.factory;
+package org.drools.planner.examples.examination.solver.move.factory;
import java.util.ArrayList;
import java.util.List;
@@ -6,12 +6,12 @@
import org.drools.planner.core.move.Move;
import org.drools.planner.core.move.factory.AbstractMoveFactory;
import org.drools.planner.core.solution.Solution;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
-import org.drools.planner.examples.itc2007.examination.domain.Period;
-import org.drools.planner.examples.itc2007.examination.domain.Room;
-import org.drools.planner.examples.itc2007.examination.solver.move.PeriodChangeMove;
-import org.drools.planner.examples.itc2007.examination.solver.move.RoomChangeMove;
+import org.drools.planner.examples.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Examination;
+import org.drools.planner.examples.examination.domain.Period;
+import org.drools.planner.examples.examination.domain.Room;
+import org.drools.planner.examples.examination.solver.move.PeriodChangeMove;
+import org.drools.planner.examples.examination.solver.move.RoomChangeMove;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/PeriodChangeMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/solver/move/factory/PeriodChangeMoveFactory.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/PeriodChangeMoveFactory.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.examination.solver.move.factory;
+package org.drools.planner.examples.examination.solver.move.factory;
import java.util.ArrayList;
import java.util.List;
@@ -6,10 +6,10 @@
import org.drools.planner.core.move.Move;
import org.drools.planner.core.move.factory.CachedMoveFactory;
import org.drools.planner.core.solution.Solution;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
-import org.drools.planner.examples.itc2007.examination.domain.Period;
-import org.drools.planner.examples.itc2007.examination.solver.move.PeriodChangeMove;
+import org.drools.planner.examples.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Examination;
+import org.drools.planner.examples.examination.domain.Period;
+import org.drools.planner.examples.examination.solver.move.PeriodChangeMove;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/RoomChangeMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/solver/move/factory/RoomChangeMoveFactory.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/move/factory/RoomChangeMoveFactory.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.examination.solver.move.factory;
+package org.drools.planner.examples.examination.solver.move.factory;
import java.util.ArrayList;
import java.util.List;
@@ -6,10 +6,10 @@
import org.drools.planner.core.move.Move;
import org.drools.planner.core.move.factory.CachedMoveFactory;
import org.drools.planner.core.solution.Solution;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
-import org.drools.planner.examples.itc2007.examination.domain.Room;
-import org.drools.planner.examples.itc2007.examination.solver.move.RoomChangeMove;
+import org.drools.planner.examples.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Examination;
+import org.drools.planner.examples.examination.domain.Room;
+import org.drools.planner.examples.examination.solver.move.RoomChangeMove;
/**
* @author Geoffrey De Smet
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/itc2007/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.examination.solver.solution.initializer;
+package org.drools.planner.examples.examination.solver.solution.initializer;
import java.util.ArrayList;
import java.util.Collections;
@@ -16,15 +16,15 @@
import org.drools.planner.core.score.Score;
import org.drools.planner.core.score.DefaultHardAndSoftScore;
import org.drools.planner.examples.common.domain.PersistableIdComparator;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
-import org.drools.planner.examples.itc2007.examination.domain.Period;
-import org.drools.planner.examples.itc2007.examination.domain.PeriodHardConstraint;
-import org.drools.planner.examples.itc2007.examination.domain.PeriodHardConstraintType;
-import org.drools.planner.examples.itc2007.examination.domain.Room;
-import org.drools.planner.examples.itc2007.examination.domain.Topic;
-import org.drools.planner.examples.itc2007.examination.domain.solver.ExamBefore;
-import org.drools.planner.examples.itc2007.examination.domain.solver.ExamCoincidence;
+import org.drools.planner.examples.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Examination;
+import org.drools.planner.examples.examination.domain.Period;
+import org.drools.planner.examples.examination.domain.PeriodHardConstraint;
+import org.drools.planner.examples.examination.domain.PeriodHardConstraintType;
+import org.drools.planner.examples.examination.domain.Room;
+import org.drools.planner.examples.examination.domain.Topic;
+import org.drools.planner.examples.examination.domain.solver.ExamBefore;
+import org.drools.planner.examples.examination.domain.solver.ExamCoincidence;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/swingui/ExaminationPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/swingui/ExaminationPanel.java 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/swingui/ExaminationPanel.java 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.examination.swingui;
+package org.drools.planner.examples.examination.swingui;
import java.awt.Color;
import java.awt.GridLayout;
@@ -16,12 +16,12 @@
import javax.swing.JPanel;
import org.drools.planner.examples.common.swingui.SolutionPanel;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
-import org.drools.planner.examples.itc2007.examination.domain.Period;
-import org.drools.planner.examples.itc2007.examination.domain.Room;
-import org.drools.planner.examples.itc2007.examination.solver.move.PeriodChangeMove;
-import org.drools.planner.examples.itc2007.examination.solver.move.RoomChangeMove;
+import org.drools.planner.examples.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Examination;
+import org.drools.planner.examples.examination.domain.Period;
+import org.drools.planner.examples.examination.domain.Room;
+import org.drools.planner.examples.examination.solver.move.PeriodChangeMove;
+import org.drools.planner.examples.examination.solver.move.RoomChangeMove;
/**
* TODO this code is highly unoptimzed
Copied: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination (from rev 30776, labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/itc2007/examination)
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationShortSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationShortSolverBenchmarkConfig.xml 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
<solvedSolutionVerbosity>ALL</solvedSolutionVerbosity>
- <solvedSolutionFilesDirectory>local/data/itc2007/examination/solved</solvedSolutionFilesDirectory>
+ <solvedSolutionFilesDirectory>local/data/examination/solved</solvedSolutionFilesDirectory>
<sortSolverBenchmarks>true</sortSolverBenchmarks>
<!-- solverBenchmarkResultComparator -->
- <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set1_initialized.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set1_initialized.xml</inheritedUnsolvedSolutionFile>
<inheritedLocalSearchSolver>
- <scoreDrl>/org/drools/planner/examples/itc2007/examination/solver/examinationScoreRules.drl</scoreDrl>
- <startingSolutionInitializerClass>org.drools.planner.examples.itc2007.examination.solver.solution.initializer.ExaminationStartingSolutionInitializer</startingSolutionInitializerClass>
+ <scoreDrl>/org/drools/planner/examples/examination/solver/examinationScoreRules.drl</scoreDrl>
+ <startingSolutionInitializerClass>org.drools.planner.examples.examination.solver.solution.initializer.ExaminationStartingSolutionInitializer</startingSolutionInitializerClass>
<termination>
<maximumStepCount>100</maximumStepCount>
</termination>
@@ -24,15 +24,15 @@
<topSize>10</topSize>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
</selector>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
<solvedSolutionVerbosity>ALL</solvedSolutionVerbosity>
- <solvedSolutionFilesDirectory>local/data/itc2007/examination/solved</solvedSolutionFilesDirectory>
+ <solvedSolutionFilesDirectory>local/data/examination/solved</solvedSolutionFilesDirectory>
<sortSolverBenchmarks>true</sortSolverBenchmarks>
<solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
- <solverStatisticFilesDirectory>local/data/itc2007/examination/statistic</solverStatisticFilesDirectory>
+ <solverStatisticFilesDirectory>local/data/examination/statistic</solverStatisticFilesDirectory>
<!-- solverBenchmarkResultComparator -->
- <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set1.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set2.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set3.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set4.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set5.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set6.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set7.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set8.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set1.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set2.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set3.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set4.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set5.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set6.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set7.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set8.xml</inheritedUnsolvedSolutionFile>
<inheritedLocalSearchSolver>
- <scoreDrl>/org/drools/planner/examples/itc2007/examination/solver/examinationScoreRules.drl</scoreDrl>
+ <scoreDrl>/org/drools/planner/examples/examination/solver/examinationScoreRules.drl</scoreDrl>
<scoreDefinition>
<scoreDefinitionType>HARD_AND_SOFT</scoreDefinitionType>
</scoreDefinition>
- <startingSolutionInitializerClass>org.drools.planner.examples.itc2007.examination.solver.solution.initializer.ExaminationStartingSolutionInitializer</startingSolutionInitializerClass>
+ <startingSolutionInitializerClass>org.drools.planner.examples.examination.solver.solution.initializer.ExaminationStartingSolutionInitializer</startingSolutionInitializerClass>
<termination>
<!--
Official benchmark maximumSecondsSpend allowed on:
@@ -40,15 +40,15 @@
</deciderScoreComparatorFactory>
<selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
</selector>
@@ -69,15 +69,15 @@
</deciderScoreComparatorFactory>
<selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.004</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.004</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.004</relativeSelection>
</selector>
</selector>
@@ -98,15 +98,15 @@
</deciderScoreComparatorFactory>
<selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
</selector>
@@ -127,13 +127,13 @@
</deciderScoreComparatorFactory>
<selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
</selector>
</selector>
<accepter>
@@ -153,13 +153,13 @@
</deciderScoreComparatorFactory>
<selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
</selector>
</selector>
<accepter>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/itc2007/examination/solver/examinationScoreRules.drl 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationScoreRules.drl 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,22 +1,22 @@
-package org.drools.planner.examples.itc2007.examination.solver;
+package org.drools.planner.examples.examination.solver;
dialect "java"
import org.drools.planner.core.score.calculator.HardAndSoftConstraintScoreCalculator;
import org.drools.planner.core.score.constraint.IntConstraintOccurrence;
import org.drools.planner.core.score.constraint.ConstraintType;
-import org.drools.planner.examples.itc2007.examination.domain.Exam;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
-import org.drools.planner.examples.itc2007.examination.domain.InstitutionalWeighting;
-import org.drools.planner.examples.itc2007.examination.domain.Period;
-import org.drools.planner.examples.itc2007.examination.domain.PeriodHardConstraint;
-import org.drools.planner.examples.itc2007.examination.domain.PeriodHardConstraintType;
-import org.drools.planner.examples.itc2007.examination.domain.Room;
-import org.drools.planner.examples.itc2007.examination.domain.RoomHardConstraint;
-import org.drools.planner.examples.itc2007.examination.domain.RoomHardConstraintType;
-import org.drools.planner.examples.itc2007.examination.domain.Student;
-import org.drools.planner.examples.itc2007.examination.domain.Topic;
-import org.drools.planner.examples.itc2007.examination.domain.solver.TopicConflict;
+import org.drools.planner.examples.examination.domain.Exam;
+import org.drools.planner.examples.examination.domain.Examination;
+import org.drools.planner.examples.examination.domain.InstitutionalWeighting;
+import org.drools.planner.examples.examination.domain.Period;
+import org.drools.planner.examples.examination.domain.PeriodHardConstraint;
+import org.drools.planner.examples.examination.domain.PeriodHardConstraintType;
+import org.drools.planner.examples.examination.domain.Room;
+import org.drools.planner.examples.examination.domain.RoomHardConstraint;
+import org.drools.planner.examples.examination.domain.RoomHardConstraintType;
+import org.drools.planner.examples.examination.domain.Student;
+import org.drools.planner.examples.examination.domain.Topic;
+import org.drools.planner.examples.examination.domain.solver.TopicConflict;
// @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/itc2007/examination/solver/examinationSolverConfig.xml 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationSolverConfig.xml 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<localSearchSolver>
- <scoreDrl>/org/drools/planner/examples/itc2007/examination/solver/examinationScoreRules.drl</scoreDrl>
+ <scoreDrl>/org/drools/planner/examples/examination/solver/examinationScoreRules.drl</scoreDrl>
<scoreDefinition>
<scoreDefinitionType>HARD_AND_SOFT</scoreDefinitionType>
</scoreDefinition>
- <startingSolutionInitializerClass>org.drools.planner.examples.itc2007.examination.solver.solution.initializer.ExaminationStartingSolutionInitializer</startingSolutionInitializerClass>
+ <startingSolutionInitializerClass>org.drools.planner.examples.examination.solver.solution.initializer.ExaminationStartingSolutionInitializer</startingSolutionInitializerClass>
<termination>
<!--
Official benchmark maximumSecondsSpend allowed on:
@@ -29,15 +29,15 @@
<topSize>10</topSize>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
<selector>
- <moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.002</relativeSelection>
</selector>
</selector>
@@ -50,7 +50,7 @@
<foragerType>FIRST_BEST_SCORE_IMPROVING</foragerType>
</forager>
<!--<selector>-->
- <!--<moveFactoryClass>org.drools.planner.examples.itc2007.examination.solver.move.factory.PeriodChangeExaminationMoveFactory</moveFactoryClass>-->
+ <!--<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeExaminationMoveFactory</moveFactoryClass>-->
<!--<shuffleMovesEveryStep>true</shuffleMovesEveryStep>-->
<!--</selector>-->
<!--<accepter>-->
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/solver/patientAdmissionScheduleBaseScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/solver/patientAdmissionScheduleBaseScoreRules.drl 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/solver/patientAdmissionScheduleBaseScoreRules.drl 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.examination.solver;
+package org.drools.planner.examples.examination.solver;
dialect "java"
import org.drools.planner.core.score.calculator.HardAndSoftConstraintScoreCalculator;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/solver/patientAdmissionScheduleSameBedInSameNightScoreRule.drl
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/solver/patientAdmissionScheduleSameBedInSameNightScoreRule.drl 2009-12-19 20:58:28 UTC (rev 30776)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/solver/patientAdmissionScheduleSameBedInSameNightScoreRule.drl 2009-12-20 12:34:06 UTC (rev 30777)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.examination.solver;
+package org.drools.planner.examples.examination.solver;
dialect "java"
import org.drools.planner.core.score.calculator.HardAndSoftConstraintScoreCalculator;
More information about the jboss-svn-commits
mailing list