[jboss-svn-commits] JBL Code SVN: r30776 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples: app and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Dec 19 15:58:29 EST 2009
Author: ge0ffrey
Date: 2009-12-19 15:58:28 -0500 (Sat, 19 Dec 2009)
New Revision: 30776
Added:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/
Removed:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/
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/curriculumcourse/app/CurriculumCourseApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Course.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Curriculum.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/CurriculumCourseSchedule.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Day.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Lecture.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Period.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Room.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Teacher.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Timeslot.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/UnavailablePeriodConstraint.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/persistence/CurriculumCourseDaoImpl.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/persistence/CurriculumCourseInputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/persistence/CurriculumCourseOutputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/CurriculumCourseMoveHelper.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/LectureSwitchMove.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/PeriodChangeMove.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/RoomChangeMove.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/factory/LectureSwitchMoveFactory.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/factory/PeriodChangeMoveFactory.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/factory/RoomChangeMoveFactory.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/solution/initializer/CurriculumCourseStartingSolutionInitializer.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/swingui/CurriculumCoursePanel.java
Log:
shorten data files of examples: curriculum course + remove itc2007 directory for curriculum course
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:50:31 UTC (rev 30775)
+++ 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)
@@ -6,7 +6,7 @@
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.itc2007.curriculumcourse.app.CurriculumCourseApp;
+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/curriculumcourse (from rev 30775, labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse)
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/app/CurriculumCourseApp.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseApp.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,13 +1,12 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.app;
+package org.drools.planner.examples.curriculumcourse.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.curriculumcourse.persistence.CurriculumCourseDaoImpl;
-import org.drools.planner.examples.itc2007.curriculumcourse.swingui.CurriculumCoursePanel;
-import org.drools.planner.examples.manners2009.persistence.Manners2009DaoImpl;
+import org.drools.planner.examples.curriculumcourse.persistence.CurriculumCourseDaoImpl;
+import org.drools.planner.examples.curriculumcourse.swingui.CurriculumCoursePanel;
/**
* @author Geoffrey De Smet
@@ -15,7 +14,7 @@
public class CurriculumCourseApp extends CommonApp {
public static final String SOLVER_CONFIG
- = "/org/drools/planner/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml";
+ = "/org/drools/planner/examples/curriculumcourse/solver/curriculumCourseSolverConfig.xml";
public static void main(String[] args) {
new CurriculumCourseApp().init();
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/app/CurriculumCourseBenchmarkApp.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseBenchmarkApp.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,9 +1,9 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.app;
+package org.drools.planner.examples.curriculumcourse.app;
import java.io.File;
import org.drools.planner.examples.common.app.CommonBenchmarkApp;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.CurriculumCourseSchedule;
+import org.drools.planner.examples.curriculumcourse.domain.CurriculumCourseSchedule;
/**
* @author Geoffrey De Smet
@@ -11,11 +11,11 @@
public class CurriculumCourseBenchmarkApp extends CommonBenchmarkApp {
public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
- = "/org/drools/planner/examples/itc2007/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml";
+ = "/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml";
public static final String SHORT_SOLVER_BENCHMARK_CONFIG
- = "/org/drools/planner/examples/itc2007/curriculumcourse/benchmark/curriculumCourseShortSolverBenchmarkConfig.xml";
+ = "/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseShortSolverBenchmarkConfig.xml";
public static final File SOLVER_BENCHMARK_RESULT_FILE
- = new File("local/data/itc2007/curriculumcourse/curriculumCourseSolverBenchmarkResult.xml");
+ = new File("local/data/curriculumcourse/curriculumCourseSolverBenchmarkResult.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/curriculumcourse/domain/Course.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/domain/Course.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Course.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,13 +1,15 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.domain;
+package org.drools.planner.examples.curriculumcourse.domain;
import java.util.List;
+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("Course")
public class Course extends AbstractPersistable implements Comparable<Course> {
private String code;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Curriculum.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/domain/Curriculum.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Curriculum.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,11 +1,13 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.domain;
+package org.drools.planner.examples.curriculumcourse.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("Curriculum")
public class Curriculum extends AbstractPersistable implements Comparable<Curriculum> {
private String code;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/CurriculumCourseSchedule.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/domain/CurriculumCourseSchedule.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/CurriculumCourseSchedule.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,10 +1,11 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.domain;
+package org.drools.planner.examples.curriculumcourse.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.Score;
@@ -14,6 +15,7 @@
/**
* @author Geoffrey De Smet
*/
+ at XStreamAlias("CurriculumCourseSchedule")
public class CurriculumCourseSchedule extends AbstractPersistable implements Solution {
private String name;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Day.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/domain/Day.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Day.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,11 +1,13 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.domain;
+package org.drools.planner.examples.curriculumcourse.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("Day")
public class Day extends AbstractPersistable implements Comparable<Day> {
private int dayIndex;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Lecture.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/domain/Lecture.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Lecture.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,7 +1,8 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.domain;
+package org.drools.planner.examples.curriculumcourse.domain;
import java.util.List;
+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;
@@ -10,6 +11,7 @@
/**
* @author Geoffrey De Smet
*/
+ at XStreamAlias("Lecture")
public class Lecture extends AbstractPersistable implements Comparable<Lecture> {
private Course course;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Period.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/domain/Period.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Period.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,11 +1,13 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.domain;
+package org.drools.planner.examples.curriculumcourse.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 Day day;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Room.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/domain/Room.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Room.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,11 +1,13 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.domain;
+package org.drools.planner.examples.curriculumcourse.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 String code;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Teacher.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/domain/Teacher.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Teacher.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,11 +1,13 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.domain;
+package org.drools.planner.examples.curriculumcourse.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("Teacher")
public class Teacher extends AbstractPersistable implements Comparable<Teacher> {
private String code;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Timeslot.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/domain/Timeslot.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/Timeslot.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,11 +1,13 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.domain;
+package org.drools.planner.examples.curriculumcourse.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("Timeslot")
public class Timeslot extends AbstractPersistable implements Comparable<Timeslot> {
private int timeslotIndex;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/UnavailablePeriodConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/domain/UnavailablePeriodConstraint.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/domain/UnavailablePeriodConstraint.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,11 +1,13 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.domain;
+package org.drools.planner.examples.curriculumcourse.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("UnavailablePeriodConstraint")
public class UnavailablePeriodConstraint extends AbstractPersistable
implements Comparable<UnavailablePeriodConstraint> {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/persistence/CurriculumCourseDaoImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/persistence/CurriculumCourseDaoImpl.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/persistence/CurriculumCourseDaoImpl.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,8 +1,7 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.persistence;
+package org.drools.planner.examples.curriculumcourse.persistence;
import org.drools.planner.examples.common.persistence.XstreamSolutionDaoImpl;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.CurriculumCourseSchedule;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
+import org.drools.planner.examples.curriculumcourse.domain.CurriculumCourseSchedule;
/**
* @author Geoffrey De Smet
@@ -10,7 +9,7 @@
public class CurriculumCourseDaoImpl extends XstreamSolutionDaoImpl {
public CurriculumCourseDaoImpl() {
- super("itc2007/curriculumcourse", CurriculumCourseSchedule.class);
+ super("curriculumcourse", CurriculumCourseSchedule.class);
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/persistence/CurriculumCourseInputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/persistence/CurriculumCourseInputConvertor.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/persistence/CurriculumCourseInputConvertor.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.persistence;
+package org.drools.planner.examples.curriculumcourse.persistence;
import java.io.IOException;
import java.util.ArrayList;
@@ -8,16 +8,15 @@
import java.util.Map;
import org.drools.planner.examples.common.persistence.AbstractInputConvertor;
-import org.drools.planner.examples.common.persistence.SolutionDao;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Course;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Curriculum;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.CurriculumCourseSchedule;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Day;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Period;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Room;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Teacher;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Timeslot;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.UnavailablePeriodConstraint;
+import org.drools.planner.examples.curriculumcourse.domain.Course;
+import org.drools.planner.examples.curriculumcourse.domain.Curriculum;
+import org.drools.planner.examples.curriculumcourse.domain.CurriculumCourseSchedule;
+import org.drools.planner.examples.curriculumcourse.domain.Day;
+import org.drools.planner.examples.curriculumcourse.domain.Period;
+import org.drools.planner.examples.curriculumcourse.domain.Room;
+import org.drools.planner.examples.curriculumcourse.domain.Teacher;
+import org.drools.planner.examples.curriculumcourse.domain.Timeslot;
+import org.drools.planner.examples.curriculumcourse.domain.UnavailablePeriodConstraint;
import org.drools.planner.core.solution.Solution;
/**
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/persistence/CurriculumCourseOutputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/persistence/CurriculumCourseOutputConvertor.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/persistence/CurriculumCourseOutputConvertor.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,11 +1,10 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.persistence;
+package org.drools.planner.examples.curriculumcourse.persistence;
import java.io.IOException;
import org.drools.planner.examples.common.persistence.AbstractOutputConvertor;
-import org.drools.planner.examples.common.persistence.SolutionDao;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.CurriculumCourseSchedule;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Lecture;
+import org.drools.planner.examples.curriculumcourse.domain.CurriculumCourseSchedule;
+import org.drools.planner.examples.curriculumcourse.domain.Lecture;
import org.drools.planner.core.solution.Solution;
/**
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/CurriculumCourseMoveHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/solver/move/CurriculumCourseMoveHelper.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/CurriculumCourseMoveHelper.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,11 +1,11 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.solver.move;
+package org.drools.planner.examples.curriculumcourse.solver.move;
import org.drools.WorkingMemory;
import org.drools.runtime.rule.FactHandle;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Lecture;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Period;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Room;
+import org.drools.planner.examples.curriculumcourse.domain.Lecture;
+import org.drools.planner.examples.curriculumcourse.domain.Period;
+import org.drools.planner.examples.curriculumcourse.domain.Room;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/LectureSwitchMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/solver/move/LectureSwitchMove.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/LectureSwitchMove.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.solver.move;
+package org.drools.planner.examples.curriculumcourse.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.curriculumcourse.domain.Lecture;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Period;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Room;
+import org.drools.planner.examples.curriculumcourse.domain.Lecture;
+import org.drools.planner.examples.curriculumcourse.domain.Period;
+import org.drools.planner.examples.curriculumcourse.domain.Room;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/PeriodChangeMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/solver/move/PeriodChangeMove.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/PeriodChangeMove.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.solver.move;
+package org.drools.planner.examples.curriculumcourse.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.curriculumcourse.domain.Lecture;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Period;
+import org.drools.planner.examples.curriculumcourse.domain.Lecture;
+import org.drools.planner.examples.curriculumcourse.domain.Period;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/RoomChangeMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/solver/move/RoomChangeMove.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/RoomChangeMove.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.solver.move;
+package org.drools.planner.examples.curriculumcourse.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.curriculumcourse.domain.Lecture;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Room;
+import org.drools.planner.examples.curriculumcourse.domain.Lecture;
+import org.drools.planner.examples.curriculumcourse.domain.Room;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/factory/LectureSwitchMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/solver/move/factory/LectureSwitchMoveFactory.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/factory/LectureSwitchMoveFactory.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.solver.move.factory;
+package org.drools.planner.examples.curriculumcourse.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.curriculumcourse.domain.CurriculumCourseSchedule;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Lecture;
-import org.drools.planner.examples.itc2007.curriculumcourse.solver.move.LectureSwitchMove;
+import org.drools.planner.examples.curriculumcourse.domain.CurriculumCourseSchedule;
+import org.drools.planner.examples.curriculumcourse.domain.Lecture;
+import org.drools.planner.examples.curriculumcourse.solver.move.LectureSwitchMove;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/factory/PeriodChangeMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/solver/move/factory/PeriodChangeMoveFactory.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/factory/PeriodChangeMoveFactory.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.solver.move.factory;
+package org.drools.planner.examples.curriculumcourse.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.curriculumcourse.domain.CurriculumCourseSchedule;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Lecture;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Period;
-import org.drools.planner.examples.itc2007.curriculumcourse.solver.move.PeriodChangeMove;
+import org.drools.planner.examples.curriculumcourse.domain.CurriculumCourseSchedule;
+import org.drools.planner.examples.curriculumcourse.domain.Lecture;
+import org.drools.planner.examples.curriculumcourse.domain.Period;
+import org.drools.planner.examples.curriculumcourse.solver.move.PeriodChangeMove;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/factory/RoomChangeMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/solver/move/factory/RoomChangeMoveFactory.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/move/factory/RoomChangeMoveFactory.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.solver.move.factory;
+package org.drools.planner.examples.curriculumcourse.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.curriculumcourse.domain.CurriculumCourseSchedule;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Lecture;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Room;
-import org.drools.planner.examples.itc2007.curriculumcourse.solver.move.RoomChangeMove;
+import org.drools.planner.examples.curriculumcourse.domain.CurriculumCourseSchedule;
+import org.drools.planner.examples.curriculumcourse.domain.Lecture;
+import org.drools.planner.examples.curriculumcourse.domain.Room;
+import org.drools.planner.examples.curriculumcourse.solver.move.RoomChangeMove;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/solution/initializer/CurriculumCourseStartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/solver/solution/initializer/CurriculumCourseStartingSolutionInitializer.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/solver/solution/initializer/CurriculumCourseStartingSolutionInitializer.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.solver.solution.initializer;
+package org.drools.planner.examples.curriculumcourse.solver.solution.initializer;
import java.util.ArrayList;
import java.util.Collections;
@@ -12,12 +12,12 @@
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.curriculumcourse.domain.Course;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.CurriculumCourseSchedule;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Lecture;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Period;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Room;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.UnavailablePeriodConstraint;
+import org.drools.planner.examples.curriculumcourse.domain.Course;
+import org.drools.planner.examples.curriculumcourse.domain.CurriculumCourseSchedule;
+import org.drools.planner.examples.curriculumcourse.domain.Lecture;
+import org.drools.planner.examples.curriculumcourse.domain.Period;
+import org.drools.planner.examples.curriculumcourse.domain.Room;
+import org.drools.planner.examples.curriculumcourse.domain.UnavailablePeriodConstraint;
/**
* @author Geoffrey De Smet
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/swingui/CurriculumCoursePanel.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/swingui/CurriculumCoursePanel.java 2009-12-19 20:50:31 UTC (rev 30775)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/swingui/CurriculumCoursePanel.java 2009-12-19 20:58:28 UTC (rev 30776)
@@ -1,4 +1,4 @@
-package org.drools.planner.examples.itc2007.curriculumcourse.swingui;
+package org.drools.planner.examples.curriculumcourse.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.curriculumcourse.domain.CurriculumCourseSchedule;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Lecture;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Period;
-import org.drools.planner.examples.itc2007.curriculumcourse.domain.Room;
-import org.drools.planner.examples.itc2007.curriculumcourse.solver.move.PeriodChangeMove;
-import org.drools.planner.examples.itc2007.curriculumcourse.solver.move.RoomChangeMove;
+import org.drools.planner.examples.curriculumcourse.domain.CurriculumCourseSchedule;
+import org.drools.planner.examples.curriculumcourse.domain.Lecture;
+import org.drools.planner.examples.curriculumcourse.domain.Period;
+import org.drools.planner.examples.curriculumcourse.domain.Room;
+import org.drools.planner.examples.curriculumcourse.solver.move.PeriodChangeMove;
+import org.drools.planner.examples.curriculumcourse.solver.move.RoomChangeMove;
/**
* TODO this code is highly unoptimzed
More information about the jboss-svn-commits
mailing list