[jboss-svn-commits] JBL Code SVN: r30774 - in labs/jbossrules/trunk/drools-planner: drools-planner-examples/data/nqueens/solved and 24 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Dec 18 11:13:09 EST 2009
Author: ge0ffrey
Date: 2009-12-18 11:13:07 -0500 (Fri, 18 Dec 2009)
New Revision: 30774
Added:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/persistence/CurriculumCourseDaoImpl.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/persistence/ExaminationDaoImpl.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/persistence/
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/persistence/LessonScheduleDaoImpl.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/persistence/Manners2009DaoImpl.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/persistence/NQueensDaoImpl.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/persistence/PatientAdmissionScheduleDaoImpl.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/simple/SimpleTravelingTournamentDaoImpl.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/smart/SmartTravelingTournamentDaoImpl.java
Modified:
labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/XmlSolverBenchmarker.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens04.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens08.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens16.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens32.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens64.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens04.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens08.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens16.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens32.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens64.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/app/CommonApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/app/CommonBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractInputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractOutputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/SolutionDao.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/XstreamSolutionDaoImpl.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/swingui/WorkflowFrame.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/app/CurriculumCourseApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/app/CurriculumCourseBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/persistence/CurriculumCourseInputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/persistence/CurriculumCourseOutputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/app/ExaminationApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/app/ExaminationBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/persistence/ExaminationInputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/persistence/ExaminationOutputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/app/LessonScheduleApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/app/Manners2009App.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/persistence/Manners2009InputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/app/NQueensApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/app/NQueensBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/domain/NQueens.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/domain/Queen.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/persistence/NQueensGenerator.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/app/PatientAdmissionScheduleApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/app/PatientAdmissionScheduleBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/persistence/PatientAdmissionScheduleInputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/persistence/PatientAdmissionScheduleOutputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/simple/SimpleTravelingTournamentApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/smart/SmartTravelingTournamentApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/smart/SmartTravelingTournamentBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/TravelingTournamentInputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/simple/SimpleTravelingTournamentInputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/smart/SmartTravelingTournamentInputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/smart/SmartTravelingTournamentOutputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nqueens/NQueensSmokeTest.java
Log:
shorten data files of examples: xstream annotation processing implementation + nqueens
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/XmlSolverBenchmarker.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/XmlSolverBenchmarker.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/XmlSolverBenchmarker.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -32,8 +32,8 @@
xStream.processAnnotations(SolverBenchmark.class);
}
- public void addXstreamAnnotations(Class annotationsClass) {
- xStream.processAnnotations(annotationsClass);
+ public void addXstreamAnnotations(Class ... xstreamAnnotations) {
+ xStream.processAnnotations(xstreamAnnotations);
}
// ************************************************************************
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens04.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens04.xml 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens04.xml 2009-12-18 16:13:07 UTC (rev 30774)
@@ -1,24 +1,24 @@
-<org.drools.planner.examples.nqueens.domain.NQueens id="1">
+<NQueens id="1">
<queenList id="2">
- <org.drools.planner.examples.nqueens.domain.Queen id="3">
+ <Queen id="3">
<id>0</id>
<x>0</x>
<y>1</y>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="4">
+ </Queen>
+ <Queen id="4">
<id>1</id>
<x>1</x>
<y>3</y>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="5">
+ </Queen>
+ <Queen id="5">
<id>2</id>
<x>2</x>
<y>0</y>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="6">
+ </Queen>
+ <Queen id="6">
<id>3</id>
<x>3</x>
<y>2</y>
- </org.drools.planner.examples.nqueens.domain.Queen>
+ </Queen>
</queenList>
-</org.drools.planner.examples.nqueens.domain.NQueens>
\ No newline at end of file
+</NQueens>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens08.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens08.xml 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens08.xml 2009-12-18 16:13:07 UTC (rev 30774)
@@ -1,44 +1,44 @@
-<org.drools.planner.examples.nqueens.domain.NQueens id="1">
+<NQueens id="1">
<queenList id="2">
- <org.drools.planner.examples.nqueens.domain.Queen id="3">
+ <Queen id="3">
<x>0</x>
<y>4</y>
<id>0</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="4">
+ </Queen>
+ <Queen id="4">
<x>1</x>
<y>6</y>
<id>1</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="5">
+ </Queen>
+ <Queen id="5">
<x>2</x>
<y>1</y>
<id>2</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="6">
+ </Queen>
+ <Queen id="6">
<x>3</x>
<y>5</y>
<id>3</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="7">
+ </Queen>
+ <Queen id="7">
<x>4</x>
<y>2</y>
<id>4</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="8">
+ </Queen>
+ <Queen id="8">
<x>5</x>
<y>0</y>
<id>5</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="9">
+ </Queen>
+ <Queen id="9">
<x>6</x>
<y>7</y>
<id>6</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="10">
+ </Queen>
+ <Queen id="10">
<x>7</x>
<y>3</y>
<id>7</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
+ </Queen>
</queenList>
-</org.drools.planner.examples.nqueens.domain.NQueens>
\ No newline at end of file
+</NQueens>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens16.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens16.xml 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens16.xml 2009-12-18 16:13:07 UTC (rev 30774)
@@ -1,84 +1,88 @@
-<org.drools.planner.examples.nqueens.domain.NQueens id="1">
+<NQueens id="1">
+ <id>0</id>
<queenList id="2">
- <org.drools.planner.examples.nqueens.domain.Queen id="3">
+ <Queen id="3">
+ <id>0</id>
<x>0</x>
- <y>3</y>
- <id>0</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="4">
+ <y>5</y>
+ </Queen>
+ <Queen id="4">
+ <id>1</id>
<x>1</x>
- <y>9</y>
- <id>1</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="5">
+ <y>0</y>
+ </Queen>
+ <Queen id="5">
+ <id>2</id>
<x>2</x>
- <y>13</y>
- <id>2</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="6">
+ <y>12</y>
+ </Queen>
+ <Queen id="6">
+ <id>3</id>
<x>3</x>
- <y>10</y>
- <id>3</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="7">
+ <y>9</y>
+ </Queen>
+ <Queen id="7">
+ <id>4</id>
<x>4</x>
- <y>8</y>
- <id>4</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="8">
+ <y>2</y>
+ </Queen>
+ <Queen id="8">
+ <id>5</id>
<x>5</x>
- <y>1</y>
- <id>5</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="9">
+ <y>13</y>
+ </Queen>
+ <Queen id="9">
+ <id>6</id>
<x>6</x>
- <y>11</y>
- <id>6</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="10">
+ <y>10</y>
+ </Queen>
+ <Queen id="10">
+ <id>7</id>
<x>7</x>
- <y>2</y>
- <id>7</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="11">
+ <y>1</y>
+ </Queen>
+ <Queen id="11">
+ <id>8</id>
<x>8</x>
- <y>14</y>
- <id>8</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="12">
+ <y>15</y>
+ </Queen>
+ <Queen id="12">
+ <id>9</id>
<x>9</x>
- <y>7</y>
- <id>9</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="13">
- <x>10</x>
<y>4</y>
+ </Queen>
+ <Queen id="13">
<id>10</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="14">
+ <x>10</x>
+ <y>11</y>
+ </Queen>
+ <Queen id="14">
+ <id>11</id>
<x>11</x>
- <y>0</y>
- <id>11</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="15">
+ <y>14</y>
+ </Queen>
+ <Queen id="15">
+ <id>12</id>
<x>12</x>
- <y>12</y>
- <id>12</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="16">
+ <y>8</y>
+ </Queen>
+ <Queen id="16">
+ <id>13</id>
<x>13</x>
<y>6</y>
- <id>13</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="17">
+ </Queen>
+ <Queen id="17">
+ <id>14</id>
<x>14</x>
- <y>15</y>
- <id>14</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="18">
+ <y>3</y>
+ </Queen>
+ <Queen id="18">
+ <id>15</id>
<x>15</x>
- <y>5</y>
- <id>15</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
+ <y>7</y>
+ </Queen>
</queenList>
-</org.drools.planner.examples.nqueens.domain.NQueens>
\ No newline at end of file
+ <score class="org.drools.planner.core.score.DefaultSimpleScore" id="19">
+ <score>0</score>
+ </score>
+</NQueens>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens32.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens32.xml 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens32.xml 2009-12-18 16:13:07 UTC (rev 30774)
@@ -1,164 +1,164 @@
-<org.drools.planner.examples.nqueens.domain.NQueens id="1">
+<NQueens id="1">
<queenList id="2">
- <org.drools.planner.examples.nqueens.domain.Queen id="3">
+ <Queen id="3">
<x>0</x>
<y>20</y>
<id>0</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="4">
+ </Queen>
+ <Queen id="4">
<x>1</x>
<y>23</y>
<id>1</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="5">
+ </Queen>
+ <Queen id="5">
<x>2</x>
<y>10</y>
<id>2</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="6">
+ </Queen>
+ <Queen id="6">
<x>3</x>
<y>12</y>
<id>3</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="7">
+ </Queen>
+ <Queen id="7">
<x>4</x>
<y>2</y>
<id>4</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="8">
+ </Queen>
+ <Queen id="8">
<x>5</x>
<y>11</y>
<id>5</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="9">
+ </Queen>
+ <Queen id="9">
<x>6</x>
<y>22</y>
<id>6</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="10">
+ </Queen>
+ <Queen id="10">
<x>7</x>
<y>6</y>
<id>7</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="11">
+ </Queen>
+ <Queen id="11">
<x>8</x>
<y>15</y>
<id>8</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="12">
+ </Queen>
+ <Queen id="12">
<x>9</x>
<y>0</y>
<id>9</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="13">
+ </Queen>
+ <Queen id="13">
<x>10</x>
<y>29</y>
<id>10</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="14">
+ </Queen>
+ <Queen id="14">
<x>11</x>
<y>21</y>
<id>11</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="15">
+ </Queen>
+ <Queen id="15">
<x>12</x>
<y>25</y>
<id>12</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="16">
+ </Queen>
+ <Queen id="16">
<x>13</x>
<y>31</y>
<id>13</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="17">
+ </Queen>
+ <Queen id="17">
<x>14</x>
<y>26</y>
<id>14</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="18">
+ </Queen>
+ <Queen id="18">
<x>15</x>
<y>7</y>
<id>15</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="19">
+ </Queen>
+ <Queen id="19">
<x>16</x>
<y>1</y>
<id>16</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="20">
+ </Queen>
+ <Queen id="20">
<x>17</x>
<y>4</y>
<id>17</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="21">
+ </Queen>
+ <Queen id="21">
<x>18</x>
<y>8</y>
<id>18</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="22">
+ </Queen>
+ <Queen id="22">
<x>19</x>
<y>16</y>
<id>19</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="23">
+ </Queen>
+ <Queen id="23">
<x>20</x>
<y>14</y>
<id>20</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="24">
+ </Queen>
+ <Queen id="24">
<x>21</x>
<y>17</y>
<id>21</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="25">
+ </Queen>
+ <Queen id="25">
<x>22</x>
<y>27</y>
<id>22</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="26">
+ </Queen>
+ <Queen id="26">
<x>23</x>
<y>18</y>
<id>23</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="27">
+ </Queen>
+ <Queen id="27">
<x>24</x>
<y>24</y>
<id>24</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="28">
+ </Queen>
+ <Queen id="28">
<x>25</x>
<y>28</y>
<id>25</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="29">
+ </Queen>
+ <Queen id="29">
<x>26</x>
<y>5</y>
<id>26</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="30">
+ </Queen>
+ <Queen id="30">
<x>27</x>
<y>9</y>
<id>27</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="31">
+ </Queen>
+ <Queen id="31">
<x>28</x>
<y>30</y>
<id>28</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="32">
+ </Queen>
+ <Queen id="32">
<x>29</x>
<y>13</y>
<id>29</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="33">
+ </Queen>
+ <Queen id="33">
<x>30</x>
<y>3</y>
<id>30</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="34">
+ </Queen>
+ <Queen id="34">
<x>31</x>
<y>19</y>
<id>31</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
+ </Queen>
</queenList>
-</org.drools.planner.examples.nqueens.domain.NQueens>
\ No newline at end of file
+</NQueens>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens64.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens64.xml 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/solved/solvedNQueens64.xml 2009-12-18 16:13:07 UTC (rev 30774)
@@ -1,324 +1,324 @@
-<org.drools.planner.examples.nqueens.domain.NQueens id="1">
+<NQueens id="1">
<queenList id="2">
- <org.drools.planner.examples.nqueens.domain.Queen id="3">
+ <Queen id="3">
<x>0</x>
<y>30</y>
<id>0</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="4">
+ </Queen>
+ <Queen id="4">
<x>1</x>
<y>42</y>
<id>1</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="5">
+ </Queen>
+ <Queen id="5">
<x>2</x>
<y>47</y>
<id>2</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="6">
+ </Queen>
+ <Queen id="6">
<x>3</x>
<y>9</y>
<id>3</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="7">
+ </Queen>
+ <Queen id="7">
<x>4</x>
<y>40</y>
<id>4</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="8">
+ </Queen>
+ <Queen id="8">
<x>5</x>
<y>56</y>
<id>5</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="9">
+ </Queen>
+ <Queen id="9">
<x>6</x>
<y>21</y>
<id>6</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="10">
+ </Queen>
+ <Queen id="10">
<x>7</x>
<y>31</y>
<id>7</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="11">
+ </Queen>
+ <Queen id="11">
<x>8</x>
<y>8</y>
<id>8</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="12">
+ </Queen>
+ <Queen id="12">
<x>9</x>
<y>13</y>
<id>9</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="13">
+ </Queen>
+ <Queen id="13">
<x>10</x>
<y>58</y>
<id>10</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="14">
+ </Queen>
+ <Queen id="14">
<x>11</x>
<y>14</y>
<id>11</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="15">
+ </Queen>
+ <Queen id="15">
<x>12</x>
<y>59</y>
<id>12</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="16">
+ </Queen>
+ <Queen id="16">
<x>13</x>
<y>45</y>
<id>13</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="17">
+ </Queen>
+ <Queen id="17">
<x>14</x>
<y>28</y>
<id>14</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="18">
+ </Queen>
+ <Queen id="18">
<x>15</x>
<y>22</y>
<id>15</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="19">
+ </Queen>
+ <Queen id="19">
<x>16</x>
<y>49</y>
<id>16</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="20">
+ </Queen>
+ <Queen id="20">
<x>17</x>
<y>35</y>
<id>17</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="21">
+ </Queen>
+ <Queen id="21">
<x>18</x>
<y>16</y>
<id>18</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="22">
+ </Queen>
+ <Queen id="22">
<x>19</x>
<y>57</y>
<id>19</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="23">
+ </Queen>
+ <Queen id="23">
<x>20</x>
<y>12</y>
<id>20</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="24">
+ </Queen>
+ <Queen id="24">
<x>21</x>
<y>48</y>
<id>21</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="25">
+ </Queen>
+ <Queen id="25">
<x>22</x>
<y>17</y>
<id>22</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="26">
+ </Queen>
+ <Queen id="26">
<x>23</x>
<y>54</y>
<id>23</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="27">
+ </Queen>
+ <Queen id="27">
<x>24</x>
<y>32</y>
<id>24</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="28">
+ </Queen>
+ <Queen id="28">
<x>25</x>
<y>53</y>
<id>25</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="29">
+ </Queen>
+ <Queen id="29">
<x>26</x>
<y>19</y>
<id>26</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="30">
+ </Queen>
+ <Queen id="30">
<x>27</x>
<y>43</y>
<id>27</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="31">
+ </Queen>
+ <Queen id="31">
<x>28</x>
<y>62</y>
<id>28</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="32">
+ </Queen>
+ <Queen id="32">
<x>29</x>
<y>11</y>
<id>29</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="33">
+ </Queen>
+ <Queen id="33">
<x>30</x>
<y>55</y>
<id>30</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="34">
+ </Queen>
+ <Queen id="34">
<x>31</x>
<y>36</y>
<id>31</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="35">
+ </Queen>
+ <Queen id="35">
<x>32</x>
<y>41</y>
<id>32</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="36">
+ </Queen>
+ <Queen id="36">
<x>33</x>
<y>0</y>
<id>33</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="37">
+ </Queen>
+ <Queen id="37">
<x>34</x>
<y>60</y>
<id>34</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="38">
+ </Queen>
+ <Queen id="38">
<x>35</x>
<y>15</y>
<id>35</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="39">
+ </Queen>
+ <Queen id="39">
<x>36</x>
<y>46</y>
<id>36</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="40">
+ </Queen>
+ <Queen id="40">
<x>37</x>
<y>50</y>
<id>37</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="41">
+ </Queen>
+ <Queen id="41">
<x>38</x>
<y>37</y>
<id>38</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="42">
+ </Queen>
+ <Queen id="42">
<x>39</x>
<y>27</y>
<id>39</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="43">
+ </Queen>
+ <Queen id="43">
<x>40</x>
<y>52</y>
<id>40</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="44">
+ </Queen>
+ <Queen id="44">
<x>41</x>
<y>18</y>
<id>41</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="45">
+ </Queen>
+ <Queen id="45">
<x>42</x>
<y>61</y>
<id>42</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="46">
+ </Queen>
+ <Queen id="46">
<x>43</x>
<y>5</y>
<id>43</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="47">
+ </Queen>
+ <Queen id="47">
<x>44</x>
<y>20</y>
<id>44</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="48">
+ </Queen>
+ <Queen id="48">
<x>45</x>
<y>29</y>
<id>45</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="49">
+ </Queen>
+ <Queen id="49">
<x>46</x>
<y>33</y>
<id>46</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="50">
+ </Queen>
+ <Queen id="50">
<x>47</x>
<y>4</y>
<id>47</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="51">
+ </Queen>
+ <Queen id="51">
<x>48</x>
<y>7</y>
<id>48</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="52">
+ </Queen>
+ <Queen id="52">
<x>49</x>
<y>39</y>
<id>49</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="53">
+ </Queen>
+ <Queen id="53">
<x>50</x>
<y>3</y>
<id>50</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="54">
+ </Queen>
+ <Queen id="54">
<x>51</x>
<y>6</y>
<id>51</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="55">
+ </Queen>
+ <Queen id="55">
<x>52</x>
<y>10</y>
<id>52</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="56">
+ </Queen>
+ <Queen id="56">
<x>53</x>
<y>38</y>
<id>53</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="57">
+ </Queen>
+ <Queen id="57">
<x>54</x>
<y>26</y>
<id>54</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="58">
+ </Queen>
+ <Queen id="58">
<x>55</x>
<y>44</y>
<id>55</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="59">
+ </Queen>
+ <Queen id="59">
<x>56</x>
<y>25</y>
<id>56</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="60">
+ </Queen>
+ <Queen id="60">
<x>57</x>
<y>51</y>
<id>57</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="61">
+ </Queen>
+ <Queen id="61">
<x>58</x>
<y>2</y>
<id>58</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="62">
+ </Queen>
+ <Queen id="62">
<x>59</x>
<y>34</y>
<id>59</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="63">
+ </Queen>
+ <Queen id="63">
<x>60</x>
<y>24</y>
<id>60</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="64">
+ </Queen>
+ <Queen id="64">
<x>61</x>
<y>63</y>
<id>61</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="65">
+ </Queen>
+ <Queen id="65">
<x>62</x>
<y>1</y>
<id>62</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="66">
+ </Queen>
+ <Queen id="66">
<x>63</x>
<y>23</y>
<id>63</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
+ </Queen>
</queenList>
-</org.drools.planner.examples.nqueens.domain.NQueens>
\ No newline at end of file
+</NQueens>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens04.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens04.xml 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens04.xml 2009-12-18 16:13:07 UTC (rev 30774)
@@ -1,25 +1,25 @@
-<org.drools.planner.examples.nqueens.domain.NQueens id="1">
+<NQueens id="1">
<queenList id="2">
- <org.drools.planner.examples.nqueens.domain.Queen id="3">
+ <Queen id="3">
<x>0</x>
<y>0</y>
<id>0</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="4">
+ </Queen>
+ <Queen id="4">
<x>1</x>
<y>0</y>
<id>1</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="5">
+ </Queen>
+ <Queen id="5">
<x>2</x>
<y>0</y>
<id>2</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="6">
+ </Queen>
+ <Queen id="6">
<x>3</x>
<y>0</y>
<id>3</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
+ </Queen>
</queenList>
<id>0</id>
-</org.drools.planner.examples.nqueens.domain.NQueens>
\ No newline at end of file
+</NQueens>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens08.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens08.xml 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens08.xml 2009-12-18 16:13:07 UTC (rev 30774)
@@ -1,45 +1,45 @@
-<org.drools.planner.examples.nqueens.domain.NQueens id="1">
+<NQueens id="1">
<queenList id="2">
- <org.drools.planner.examples.nqueens.domain.Queen id="3">
+ <Queen id="3">
<x>0</x>
<y>0</y>
<id>0</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="4">
+ </Queen>
+ <Queen id="4">
<x>1</x>
<y>0</y>
<id>1</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="5">
+ </Queen>
+ <Queen id="5">
<x>2</x>
<y>0</y>
<id>2</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="6">
+ </Queen>
+ <Queen id="6">
<x>3</x>
<y>0</y>
<id>3</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="7">
+ </Queen>
+ <Queen id="7">
<x>4</x>
<y>0</y>
<id>4</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="8">
+ </Queen>
+ <Queen id="8">
<x>5</x>
<y>0</y>
<id>5</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="9">
+ </Queen>
+ <Queen id="9">
<x>6</x>
<y>0</y>
<id>6</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="10">
+ </Queen>
+ <Queen id="10">
<x>7</x>
<y>0</y>
<id>7</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
+ </Queen>
</queenList>
<id>0</id>
-</org.drools.planner.examples.nqueens.domain.NQueens>
\ No newline at end of file
+</NQueens>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens16.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens16.xml 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens16.xml 2009-12-18 16:13:07 UTC (rev 30774)
@@ -1,85 +1,85 @@
-<org.drools.planner.examples.nqueens.domain.NQueens id="1">
+<NQueens id="1">
<queenList id="2">
- <org.drools.planner.examples.nqueens.domain.Queen id="3">
+ <Queen id="3">
<x>0</x>
<y>0</y>
<id>0</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="4">
+ </Queen>
+ <Queen id="4">
<x>1</x>
<y>0</y>
<id>1</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="5">
+ </Queen>
+ <Queen id="5">
<x>2</x>
<y>0</y>
<id>2</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="6">
+ </Queen>
+ <Queen id="6">
<x>3</x>
<y>0</y>
<id>3</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="7">
+ </Queen>
+ <Queen id="7">
<x>4</x>
<y>0</y>
<id>4</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="8">
+ </Queen>
+ <Queen id="8">
<x>5</x>
<y>0</y>
<id>5</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="9">
+ </Queen>
+ <Queen id="9">
<x>6</x>
<y>0</y>
<id>6</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="10">
+ </Queen>
+ <Queen id="10">
<x>7</x>
<y>0</y>
<id>7</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="11">
+ </Queen>
+ <Queen id="11">
<x>8</x>
<y>0</y>
<id>8</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="12">
+ </Queen>
+ <Queen id="12">
<x>9</x>
<y>0</y>
<id>9</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="13">
+ </Queen>
+ <Queen id="13">
<x>10</x>
<y>0</y>
<id>10</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="14">
+ </Queen>
+ <Queen id="14">
<x>11</x>
<y>0</y>
<id>11</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="15">
+ </Queen>
+ <Queen id="15">
<x>12</x>
<y>0</y>
<id>12</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="16">
+ </Queen>
+ <Queen id="16">
<x>13</x>
<y>0</y>
<id>13</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="17">
+ </Queen>
+ <Queen id="17">
<x>14</x>
<y>0</y>
<id>14</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="18">
+ </Queen>
+ <Queen id="18">
<x>15</x>
<y>0</y>
<id>15</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
+ </Queen>
</queenList>
<id>0</id>
-</org.drools.planner.examples.nqueens.domain.NQueens>
\ No newline at end of file
+</NQueens>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens32.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens32.xml 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens32.xml 2009-12-18 16:13:07 UTC (rev 30774)
@@ -1,165 +1,165 @@
-<org.drools.planner.examples.nqueens.domain.NQueens id="1">
+<NQueens id="1">
<queenList id="2">
- <org.drools.planner.examples.nqueens.domain.Queen id="3">
+ <Queen id="3">
<x>0</x>
<y>0</y>
<id>0</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="4">
+ </Queen>
+ <Queen id="4">
<x>1</x>
<y>0</y>
<id>1</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="5">
+ </Queen>
+ <Queen id="5">
<x>2</x>
<y>0</y>
<id>2</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="6">
+ </Queen>
+ <Queen id="6">
<x>3</x>
<y>0</y>
<id>3</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="7">
+ </Queen>
+ <Queen id="7">
<x>4</x>
<y>0</y>
<id>4</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="8">
+ </Queen>
+ <Queen id="8">
<x>5</x>
<y>0</y>
<id>5</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="9">
+ </Queen>
+ <Queen id="9">
<x>6</x>
<y>0</y>
<id>6</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="10">
+ </Queen>
+ <Queen id="10">
<x>7</x>
<y>0</y>
<id>7</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="11">
+ </Queen>
+ <Queen id="11">
<x>8</x>
<y>0</y>
<id>8</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="12">
+ </Queen>
+ <Queen id="12">
<x>9</x>
<y>0</y>
<id>9</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="13">
+ </Queen>
+ <Queen id="13">
<x>10</x>
<y>0</y>
<id>10</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="14">
+ </Queen>
+ <Queen id="14">
<x>11</x>
<y>0</y>
<id>11</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="15">
+ </Queen>
+ <Queen id="15">
<x>12</x>
<y>0</y>
<id>12</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="16">
+ </Queen>
+ <Queen id="16">
<x>13</x>
<y>0</y>
<id>13</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="17">
+ </Queen>
+ <Queen id="17">
<x>14</x>
<y>0</y>
<id>14</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="18">
+ </Queen>
+ <Queen id="18">
<x>15</x>
<y>0</y>
<id>15</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="19">
+ </Queen>
+ <Queen id="19">
<x>16</x>
<y>0</y>
<id>16</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="20">
+ </Queen>
+ <Queen id="20">
<x>17</x>
<y>0</y>
<id>17</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="21">
+ </Queen>
+ <Queen id="21">
<x>18</x>
<y>0</y>
<id>18</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="22">
+ </Queen>
+ <Queen id="22">
<x>19</x>
<y>0</y>
<id>19</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="23">
+ </Queen>
+ <Queen id="23">
<x>20</x>
<y>0</y>
<id>20</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="24">
+ </Queen>
+ <Queen id="24">
<x>21</x>
<y>0</y>
<id>21</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="25">
+ </Queen>
+ <Queen id="25">
<x>22</x>
<y>0</y>
<id>22</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="26">
+ </Queen>
+ <Queen id="26">
<x>23</x>
<y>0</y>
<id>23</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="27">
+ </Queen>
+ <Queen id="27">
<x>24</x>
<y>0</y>
<id>24</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="28">
+ </Queen>
+ <Queen id="28">
<x>25</x>
<y>0</y>
<id>25</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="29">
+ </Queen>
+ <Queen id="29">
<x>26</x>
<y>0</y>
<id>26</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="30">
+ </Queen>
+ <Queen id="30">
<x>27</x>
<y>0</y>
<id>27</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="31">
+ </Queen>
+ <Queen id="31">
<x>28</x>
<y>0</y>
<id>28</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="32">
+ </Queen>
+ <Queen id="32">
<x>29</x>
<y>0</y>
<id>29</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="33">
+ </Queen>
+ <Queen id="33">
<x>30</x>
<y>0</y>
<id>30</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="34">
+ </Queen>
+ <Queen id="34">
<x>31</x>
<y>0</y>
<id>31</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
+ </Queen>
</queenList>
<id>0</id>
-</org.drools.planner.examples.nqueens.domain.NQueens>
\ No newline at end of file
+</NQueens>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens64.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens64.xml 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/data/nqueens/unsolved/unsolvedNQueens64.xml 2009-12-18 16:13:07 UTC (rev 30774)
@@ -1,325 +1,325 @@
-<org.drools.planner.examples.nqueens.domain.NQueens id="1">
+<NQueens id="1">
+ <id>0</id>
<queenList id="2">
- <org.drools.planner.examples.nqueens.domain.Queen id="3">
+ <Queen id="3">
+ <id>0</id>
<x>0</x>
<y>0</y>
- <id>0</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="4">
+ </Queen>
+ <Queen id="4">
+ <id>1</id>
<x>1</x>
<y>0</y>
- <id>1</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="5">
+ </Queen>
+ <Queen id="5">
+ <id>2</id>
<x>2</x>
<y>0</y>
- <id>2</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="6">
+ </Queen>
+ <Queen id="6">
+ <id>3</id>
<x>3</x>
<y>0</y>
- <id>3</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="7">
+ </Queen>
+ <Queen id="7">
+ <id>4</id>
<x>4</x>
<y>0</y>
- <id>4</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="8">
+ </Queen>
+ <Queen id="8">
+ <id>5</id>
<x>5</x>
<y>0</y>
- <id>5</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="9">
+ </Queen>
+ <Queen id="9">
+ <id>6</id>
<x>6</x>
<y>0</y>
- <id>6</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="10">
+ </Queen>
+ <Queen id="10">
+ <id>7</id>
<x>7</x>
<y>0</y>
- <id>7</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="11">
+ </Queen>
+ <Queen id="11">
+ <id>8</id>
<x>8</x>
<y>0</y>
- <id>8</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="12">
+ </Queen>
+ <Queen id="12">
+ <id>9</id>
<x>9</x>
<y>0</y>
- <id>9</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="13">
+ </Queen>
+ <Queen id="13">
+ <id>10</id>
<x>10</x>
<y>0</y>
- <id>10</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="14">
+ </Queen>
+ <Queen id="14">
+ <id>11</id>
<x>11</x>
<y>0</y>
- <id>11</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="15">
+ </Queen>
+ <Queen id="15">
+ <id>12</id>
<x>12</x>
<y>0</y>
- <id>12</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="16">
+ </Queen>
+ <Queen id="16">
+ <id>13</id>
<x>13</x>
<y>0</y>
- <id>13</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="17">
+ </Queen>
+ <Queen id="17">
+ <id>14</id>
<x>14</x>
<y>0</y>
- <id>14</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="18">
+ </Queen>
+ <Queen id="18">
+ <id>15</id>
<x>15</x>
<y>0</y>
- <id>15</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="19">
+ </Queen>
+ <Queen id="19">
+ <id>16</id>
<x>16</x>
<y>0</y>
- <id>16</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="20">
+ </Queen>
+ <Queen id="20">
+ <id>17</id>
<x>17</x>
<y>0</y>
- <id>17</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="21">
+ </Queen>
+ <Queen id="21">
+ <id>18</id>
<x>18</x>
<y>0</y>
- <id>18</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="22">
+ </Queen>
+ <Queen id="22">
+ <id>19</id>
<x>19</x>
<y>0</y>
- <id>19</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="23">
+ </Queen>
+ <Queen id="23">
+ <id>20</id>
<x>20</x>
<y>0</y>
- <id>20</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="24">
+ </Queen>
+ <Queen id="24">
+ <id>21</id>
<x>21</x>
<y>0</y>
- <id>21</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="25">
+ </Queen>
+ <Queen id="25">
+ <id>22</id>
<x>22</x>
<y>0</y>
- <id>22</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="26">
+ </Queen>
+ <Queen id="26">
+ <id>23</id>
<x>23</x>
<y>0</y>
- <id>23</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="27">
+ </Queen>
+ <Queen id="27">
+ <id>24</id>
<x>24</x>
<y>0</y>
- <id>24</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="28">
+ </Queen>
+ <Queen id="28">
+ <id>25</id>
<x>25</x>
<y>0</y>
- <id>25</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="29">
+ </Queen>
+ <Queen id="29">
+ <id>26</id>
<x>26</x>
<y>0</y>
- <id>26</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="30">
+ </Queen>
+ <Queen id="30">
+ <id>27</id>
<x>27</x>
<y>0</y>
- <id>27</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="31">
+ </Queen>
+ <Queen id="31">
+ <id>28</id>
<x>28</x>
<y>0</y>
- <id>28</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="32">
+ </Queen>
+ <Queen id="32">
+ <id>29</id>
<x>29</x>
<y>0</y>
- <id>29</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="33">
+ </Queen>
+ <Queen id="33">
+ <id>30</id>
<x>30</x>
<y>0</y>
- <id>30</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="34">
+ </Queen>
+ <Queen id="34">
+ <id>31</id>
<x>31</x>
<y>0</y>
- <id>31</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="35">
+ </Queen>
+ <Queen id="35">
+ <id>32</id>
<x>32</x>
<y>0</y>
- <id>32</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="36">
+ </Queen>
+ <Queen id="36">
+ <id>33</id>
<x>33</x>
<y>0</y>
- <id>33</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="37">
+ </Queen>
+ <Queen id="37">
+ <id>34</id>
<x>34</x>
<y>0</y>
- <id>34</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="38">
+ </Queen>
+ <Queen id="38">
+ <id>35</id>
<x>35</x>
<y>0</y>
- <id>35</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="39">
+ </Queen>
+ <Queen id="39">
+ <id>36</id>
<x>36</x>
<y>0</y>
- <id>36</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="40">
+ </Queen>
+ <Queen id="40">
+ <id>37</id>
<x>37</x>
<y>0</y>
- <id>37</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="41">
+ </Queen>
+ <Queen id="41">
+ <id>38</id>
<x>38</x>
<y>0</y>
- <id>38</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="42">
+ </Queen>
+ <Queen id="42">
+ <id>39</id>
<x>39</x>
<y>0</y>
- <id>39</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="43">
+ </Queen>
+ <Queen id="43">
+ <id>40</id>
<x>40</x>
<y>0</y>
- <id>40</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="44">
+ </Queen>
+ <Queen id="44">
+ <id>41</id>
<x>41</x>
<y>0</y>
- <id>41</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="45">
+ </Queen>
+ <Queen id="45">
+ <id>42</id>
<x>42</x>
<y>0</y>
- <id>42</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="46">
+ </Queen>
+ <Queen id="46">
+ <id>43</id>
<x>43</x>
<y>0</y>
- <id>43</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="47">
+ </Queen>
+ <Queen id="47">
+ <id>44</id>
<x>44</x>
<y>0</y>
- <id>44</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="48">
+ </Queen>
+ <Queen id="48">
+ <id>45</id>
<x>45</x>
<y>0</y>
- <id>45</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="49">
+ </Queen>
+ <Queen id="49">
+ <id>46</id>
<x>46</x>
<y>0</y>
- <id>46</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="50">
+ </Queen>
+ <Queen id="50">
+ <id>47</id>
<x>47</x>
<y>0</y>
- <id>47</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="51">
+ </Queen>
+ <Queen id="51">
+ <id>48</id>
<x>48</x>
<y>0</y>
- <id>48</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="52">
+ </Queen>
+ <Queen id="52">
+ <id>49</id>
<x>49</x>
<y>0</y>
- <id>49</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="53">
+ </Queen>
+ <Queen id="53">
+ <id>50</id>
<x>50</x>
<y>0</y>
- <id>50</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="54">
+ </Queen>
+ <Queen id="54">
+ <id>51</id>
<x>51</x>
<y>0</y>
- <id>51</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="55">
+ </Queen>
+ <Queen id="55">
+ <id>52</id>
<x>52</x>
<y>0</y>
- <id>52</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="56">
+ </Queen>
+ <Queen id="56">
+ <id>53</id>
<x>53</x>
<y>0</y>
- <id>53</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="57">
+ </Queen>
+ <Queen id="57">
+ <id>54</id>
<x>54</x>
<y>0</y>
- <id>54</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="58">
+ </Queen>
+ <Queen id="58">
+ <id>55</id>
<x>55</x>
<y>0</y>
- <id>55</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="59">
+ </Queen>
+ <Queen id="59">
+ <id>56</id>
<x>56</x>
<y>0</y>
- <id>56</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="60">
+ </Queen>
+ <Queen id="60">
+ <id>57</id>
<x>57</x>
<y>0</y>
- <id>57</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="61">
+ </Queen>
+ <Queen id="61">
+ <id>58</id>
<x>58</x>
<y>0</y>
- <id>58</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="62">
+ </Queen>
+ <Queen id="62">
+ <id>59</id>
<x>59</x>
<y>0</y>
- <id>59</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="63">
+ </Queen>
+ <Queen id="63">
+ <id>60</id>
<x>60</x>
<y>0</y>
- <id>60</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="64">
+ </Queen>
+ <Queen id="64">
+ <id>61</id>
<x>61</x>
<y>0</y>
- <id>61</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="65">
+ </Queen>
+ <Queen id="65">
+ <id>62</id>
<x>62</x>
<y>0</y>
- <id>62</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
- <org.drools.planner.examples.nqueens.domain.Queen id="66">
+ </Queen>
+ <Queen id="66">
+ <id>63</id>
<x>63</x>
<y>0</y>
- <id>63</id>
- </org.drools.planner.examples.nqueens.domain.Queen>
+ </Queen>
</queenList>
- <id>0</id>
-</org.drools.planner.examples.nqueens.domain.NQueens>
\ No newline at end of file
+</NQueens>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/app/CommonApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/app/CommonApp.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/app/CommonApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -15,9 +15,13 @@
public abstract class CommonApp extends LoggingMain {
private WorkflowFrame workflowFrame;
+ private SolutionDao solutionDao;
+ private SolutionBusiness solutionBusiness;
public CommonApp() {
- workflowFrame = new WorkflowFrame(createSolutionBusiness(), createSolutionPanel(), getExampleDirName());
+ solutionDao = createSolutionDao();
+ solutionBusiness = createSolutionBusiness();
+ workflowFrame = new WorkflowFrame(solutionBusiness, createSolutionPanel(), solutionDao.getDirName());
}
public void init() {
@@ -27,18 +31,14 @@
protected SolutionBusiness createSolutionBusiness() {
SolutionBusiness solutionBusiness = new SolutionBusiness();
- solutionBusiness.setSolutionDao(createSolutionDao());
- solutionBusiness.setDataDir(new File("data/" + getExampleDirName()));
+ solutionBusiness.setSolutionDao(solutionDao);
+ solutionBusiness.setDataDir(solutionDao.getDataDir());
solutionBusiness.setSolver(createSolver());
return solutionBusiness;
}
- protected SolutionDao createSolutionDao() {
- return new XstreamSolutionDaoImpl();
- }
+ protected abstract SolutionDao createSolutionDao();
- protected abstract String getExampleDirName();
-
protected abstract Solver createSolver();
protected abstract SolutionPanel createSolutionPanel();
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/app/CommonBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/app/CommonBenchmarkApp.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/app/CommonBenchmarkApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -14,10 +14,11 @@
private File resultFile;
protected XmlSolverBenchmarker solverBenchmarker;
- protected CommonBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
+ protected CommonBenchmarkApp(String solverBenchmarkConfig, File resultFile, Class ... xstreamAnnotations) {
super(LOGGING_CONFIG);
this.resultFile = resultFile;
solverBenchmarker = new XmlSolverBenchmarker().configure(solverBenchmarkConfig);
+ solverBenchmarker.addXstreamAnnotations(xstreamAnnotations);
}
public void process() {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractInputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractInputConvertor.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractInputConvertor.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -18,17 +18,21 @@
private static final String DEFAULT_INPUT_FILE_SUFFIX = ".txt";
protected static final String DEFAULT_OUTPUT_FILE_SUFFIX = ".xml";
+
+ protected SolutionDao solutionDao;
+ protected AbstractInputConvertor(SolutionDao solutionDao) {
+ this.solutionDao = solutionDao;
+ }
+
protected File getInputDir() {
- return new File("data/" + getExampleDirName() + "/input/");
+ return new File(solutionDao.getDataDir(), "input");
}
protected File getOutputDir() {
- return new File("data/" + getExampleDirName() + "/unsolved/");
+ return new File(solutionDao.getDataDir(), "unsolved");
}
- protected abstract String getExampleDirName();
-
protected String getInputFileSuffix() {
return DEFAULT_INPUT_FILE_SUFFIX;
}
@@ -40,7 +44,6 @@
public void convertAll() {
File inputDir = getInputDir();
File outputDir = getOutputDir();
- XstreamSolutionDaoImpl solutionDao = new XstreamSolutionDaoImpl();
File[] inputFiles = inputDir.listFiles();
if (inputFiles == null) {
throw new IllegalArgumentException(
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractOutputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractOutputConvertor.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractOutputConvertor.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -19,16 +19,20 @@
private static final String DEFAULT_INPUT_FILE_SUFFIX = ".xml";
protected static final String DEFAULT_OUTPUT_FILE_SUFFIX = ".txt";
+ protected SolutionDao solutionDao;
+
+ protected AbstractOutputConvertor(SolutionDao solutionDao) {
+ this.solutionDao = solutionDao;
+ }
+
protected File getInputDir() {
- return new File("data/" + getExampleDirName() + "/solved/");
+ return new File(solutionDao.getDataDir(), "solved");
}
protected File getOutputDir() {
- return new File("data/" + getExampleDirName() + "/output/");
+ return new File(solutionDao.getDataDir(), "output");
}
- protected abstract String getExampleDirName();
-
protected String getInputFileSuffix() {
return DEFAULT_INPUT_FILE_SUFFIX;
}
@@ -40,7 +44,6 @@
public void convertAll() {
File inputDir = getInputDir();
File outputDir = getOutputDir();
- XstreamSolutionDaoImpl solutionDao = new XstreamSolutionDaoImpl();
File[] inputFiles = inputDir.listFiles();
Arrays.sort(inputFiles);
if (inputFiles == null) {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/SolutionDao.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/SolutionDao.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/SolutionDao.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -10,8 +10,11 @@
*/
public interface SolutionDao {
+ String getDirName();
+ File getDataDir();
+
Solution readSolution(File file);
Solution readSolution(InputStream in);
void writeSolution(Solution solution, File file);
-
+
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/XstreamSolutionDaoImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/XstreamSolutionDaoImpl.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/XstreamSolutionDaoImpl.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -21,18 +21,31 @@
/**
* @author Geoffrey De Smet
*/
-public class XstreamSolutionDaoImpl implements SolutionDao {
+public abstract class XstreamSolutionDaoImpl implements SolutionDao {
protected final transient Logger logger = LoggerFactory.getLogger(getClass());
private XStream xStream;
+ private String dirName;
+ private File dataDir;
- public XstreamSolutionDaoImpl() {
+ public XstreamSolutionDaoImpl(String dirName, Class ... xstreamAnnotations) {
+ this.dirName = dirName;
+ dataDir = new File("data/" + dirName);
// TODO From Xstream 1.3.3 that KeySorter will be the default. See http://jira.codehaus.org/browse/XSTR-363
xStream = new XStream(new PureJavaReflectionProvider(new FieldDictionary(new NativeFieldKeySorter())));
xStream.setMode(XStream.ID_REFERENCES);
+ xStream.processAnnotations(xstreamAnnotations);
}
+ public String getDirName() {
+ return dirName;
+ }
+
+ public File getDataDir() {
+ return dataDir;
+ }
+
public Solution readSolution(File file) {
Reader reader = null;
try {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/swingui/WorkflowFrame.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/swingui/WorkflowFrame.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/swingui/WorkflowFrame.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -54,7 +54,7 @@
private ShowConstraintScoreMapDialogAction showConstraintScoreMapDialogAction;
public WorkflowFrame(SolutionBusiness solutionBusiness, SolutionPanel solutionPanel, String exampleName) {
- super("Drools solver example " + exampleName);
+ super("Drools planner example " + exampleName);
this.solutionBusiness = solutionBusiness;
this.solutionPanel = solutionPanel;
solutionPanel.setSolutionBusiness(solutionBusiness);
@@ -216,7 +216,7 @@
}
public void actionPerformed(ActionEvent e) {
- // This async, so it doesn't stop the solving immediatly
+ // This async, so it doesn't stop the solving immediately
solutionBusiness.terminateSolvingEarly();
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/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-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/app/CurriculumCourseApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,8 +3,11 @@
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;
/**
* @author Geoffrey De Smet
@@ -19,6 +22,11 @@
}
@Override
+ protected SolutionDao createSolutionDao() {
+ return new CurriculumCourseDaoImpl();
+ }
+
+ @Override
protected Solver createSolver() {
XmlSolverConfigurer configurer = new XmlSolverConfigurer();
configurer.configure(SOLVER_CONFIG);
@@ -26,11 +34,6 @@
}
@Override
- protected String getExampleDirName() {
- return "itc2007/curriculumcourse";
- }
-
- @Override
protected SolutionPanel createSolutionPanel() {
return new CurriculumCoursePanel();
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/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-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/app/CurriculumCourseBenchmarkApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,6 +3,7 @@
import java.io.File;
import org.drools.planner.examples.common.app.CommonBenchmarkApp;
+import org.drools.planner.examples.itc2007.curriculumcourse.domain.CurriculumCourseSchedule;
/**
* @author Geoffrey De Smet
@@ -27,7 +28,7 @@
}
public CurriculumCourseBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
- super(solverBenchmarkConfig, resultFile);
+ super(solverBenchmarkConfig, resultFile, CurriculumCourseSchedule.class);
}
}
\ No newline at end of file
Added: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/persistence/CurriculumCourseDaoImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/persistence/CurriculumCourseDaoImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/persistence/CurriculumCourseDaoImpl.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -0,0 +1,16 @@
+package org.drools.planner.examples.itc2007.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;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class CurriculumCourseDaoImpl extends XstreamSolutionDaoImpl {
+
+ public CurriculumCourseDaoImpl() {
+ super("itc2007/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/itc2007/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-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/persistence/CurriculumCourseInputConvertor.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -8,6 +8,7 @@
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;
@@ -31,8 +32,8 @@
new CurriculumCourseInputConvertor().convertAll();
}
- protected String getExampleDirName() {
- return "itc2007/curriculumcourse";
+ public CurriculumCourseInputConvertor() {
+ super(new CurriculumCourseDaoImpl());
}
@Override
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/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-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/curriculumcourse/persistence/CurriculumCourseOutputConvertor.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,6 +3,7 @@
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.core.solution.Solution;
@@ -18,8 +19,8 @@
new CurriculumCourseOutputConvertor().convertAll();
}
- protected String getExampleDirName() {
- return "itc2007/curriculumcourse";
+ public CurriculumCourseOutputConvertor() {
+ super(new CurriculumCourseDaoImpl());
}
@Override
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/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-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/app/ExaminationApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,8 +3,11 @@
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;
/**
* @author Geoffrey De Smet
@@ -19,6 +22,11 @@
}
@Override
+ protected SolutionDao createSolutionDao() {
+ return new ExaminationDaoImpl();
+ }
+
+ @Override
protected Solver createSolver() {
XmlSolverConfigurer configurer = new XmlSolverConfigurer();
configurer.configure(SOLVER_CONFIG);
@@ -26,11 +34,6 @@
}
@Override
- protected String getExampleDirName() {
- return "itc2007/examination";
- }
-
- @Override
protected SolutionPanel createSolutionPanel() {
return new ExaminationPanel();
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/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-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/app/ExaminationBenchmarkApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,6 +3,7 @@
import java.io.File;
import org.drools.planner.examples.common.app.CommonBenchmarkApp;
+import org.drools.planner.examples.itc2007.examination.domain.Examination;
/**
* @author Geoffrey De Smet
@@ -27,7 +28,7 @@
}
public ExaminationBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
- super(solverBenchmarkConfig, resultFile);
+ super(solverBenchmarkConfig, resultFile, Examination.class);
}
}
\ No newline at end of file
Added: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/persistence/ExaminationDaoImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/persistence/ExaminationDaoImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/persistence/ExaminationDaoImpl.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -0,0 +1,16 @@
+package org.drools.planner.examples.itc2007.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;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class ExaminationDaoImpl extends XstreamSolutionDaoImpl {
+
+ public ExaminationDaoImpl() {
+ super("itc2007/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/itc2007/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-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/persistence/ExaminationInputConvertor.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -16,6 +16,7 @@
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;
@@ -39,8 +40,8 @@
new ExaminationInputConvertor().convertAll();
}
- protected String getExampleDirName() {
- return "itc2007/examination";
+ public ExaminationInputConvertor() {
+ super(new ExaminationDaoImpl());
}
@Override
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/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-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/persistence/ExaminationOutputConvertor.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -5,6 +5,7 @@
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.core.solution.Solution;
@@ -20,8 +21,8 @@
new ExaminationOutputConvertor().convertAll();
}
- protected String getExampleDirName() {
- return "itc2007/examination";
+ public ExaminationOutputConvertor() {
+ super(new ExaminationDaoImpl());
}
@Override
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/app/LessonScheduleApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/app/LessonScheduleApp.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/app/LessonScheduleApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,8 +3,11 @@
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.lessonschedule.persistence.LessonScheduleDaoImpl;
import org.drools.planner.examples.lessonschedule.swingui.LessonSchedulePanel;
+import org.drools.planner.examples.manners2009.persistence.Manners2009DaoImpl;
/**
* @author Geoffrey De Smet
@@ -19,6 +22,11 @@
}
@Override
+ protected SolutionDao createSolutionDao() {
+ return new LessonScheduleDaoImpl();
+ }
+
+ @Override
protected Solver createSolver() {
XmlSolverConfigurer configurer = new XmlSolverConfigurer();
configurer.configure(SOLVER_CONFIG);
@@ -26,11 +34,6 @@
}
@Override
- protected String getExampleDirName() {
- return "lessonschedule";
- }
-
- @Override
protected SolutionPanel createSolutionPanel() {
return new LessonSchedulePanel();
}
Added: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/persistence/LessonScheduleDaoImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/persistence/LessonScheduleDaoImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/lessonschedule/persistence/LessonScheduleDaoImpl.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -0,0 +1,16 @@
+package org.drools.planner.examples.lessonschedule.persistence;
+
+import org.drools.planner.examples.common.persistence.XstreamSolutionDaoImpl;
+import org.drools.planner.examples.lessonschedule.domain.LessonSchedule;
+import org.drools.planner.examples.manners2009.domain.Manners2009;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class LessonScheduleDaoImpl extends XstreamSolutionDaoImpl {
+
+ public LessonScheduleDaoImpl() {
+ super("lessonschedule", LessonSchedule.class);
+ }
+
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/app/Manners2009App.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/app/Manners2009App.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/app/Manners2009App.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,7 +3,9 @@
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.manners2009.persistence.Manners2009DaoImpl;
import org.drools.planner.examples.manners2009.swingui.Manners2009Panel;
/**
@@ -19,6 +21,11 @@
}
@Override
+ protected SolutionDao createSolutionDao() {
+ return new Manners2009DaoImpl();
+ }
+
+ @Override
protected Solver createSolver() {
XmlSolverConfigurer configurer = new XmlSolverConfigurer();
configurer.configure(SOLVER_CONFIG);
@@ -26,11 +33,6 @@
}
@Override
- protected String getExampleDirName() {
- return "manners2009";
- }
-
- @Override
protected SolutionPanel createSolutionPanel() {
return new Manners2009Panel();
}
Added: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/persistence/Manners2009DaoImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/persistence/Manners2009DaoImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/persistence/Manners2009DaoImpl.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -0,0 +1,16 @@
+package org.drools.planner.examples.manners2009.persistence;
+
+import org.drools.planner.examples.common.persistence.XstreamSolutionDaoImpl;
+import org.drools.planner.examples.manners2009.domain.Manners2009;
+import org.drools.planner.examples.nqueens.domain.NQueens;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class Manners2009DaoImpl extends XstreamSolutionDaoImpl {
+
+ public Manners2009DaoImpl() {
+ super("manners2009", Manners2009.class);
+ }
+
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/persistence/Manners2009InputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/persistence/Manners2009InputConvertor.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/manners2009/persistence/Manners2009InputConvertor.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -8,6 +8,7 @@
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.manners2009.domain.Gender;
import org.drools.planner.examples.manners2009.domain.Guest;
import org.drools.planner.examples.manners2009.domain.Hobby;
@@ -27,8 +28,8 @@
new Manners2009InputConvertor().convertAll();
}
- protected String getExampleDirName() {
- return "manners2009";
+ public Manners2009InputConvertor() {
+ super(new Manners2009DaoImpl());
}
public InputBuilder createInputBuilder() {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/app/NQueensApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/app/NQueensApp.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/app/NQueensApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,7 +3,9 @@
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.nqueens.persistence.NQueensDaoImpl;
import org.drools.planner.examples.nqueens.swingui.NQueensPanel;
/**
@@ -19,6 +21,11 @@
}
@Override
+ protected SolutionDao createSolutionDao() {
+ return new NQueensDaoImpl();
+ }
+
+ @Override
protected Solver createSolver() {
XmlSolverConfigurer configurer = new XmlSolverConfigurer();
configurer.configure(SOLVER_CONFIG);
@@ -26,11 +33,6 @@
}
@Override
- protected String getExampleDirName() {
- return "nqueens";
- }
-
- @Override
protected SolutionPanel createSolutionPanel() {
return new NQueensPanel();
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/app/NQueensBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/app/NQueensBenchmarkApp.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/app/NQueensBenchmarkApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,6 +3,7 @@
import java.io.File;
import org.drools.planner.examples.common.app.CommonBenchmarkApp;
+import org.drools.planner.examples.nqueens.domain.NQueens;
/**
* @author Geoffrey De Smet
@@ -19,7 +20,7 @@
}
public NQueensBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
- super(solverBenchmarkConfig, resultFile);
+ super(solverBenchmarkConfig, resultFile, NQueens.class);
}
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/domain/NQueens.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/domain/NQueens.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/domain/NQueens.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -4,6 +4,7 @@
import java.util.Collection;
import java.util.List;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.drools.planner.core.solution.Solution;
import org.drools.planner.core.score.Score;
import org.drools.planner.core.score.SimpleScore;
@@ -12,6 +13,7 @@
/**
* @author Geoffrey De Smet
*/
+ at XStreamAlias("NQueens")
public class NQueens extends AbstractPersistable implements Solution {
private List<Queen> queenList;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/domain/Queen.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/domain/Queen.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/domain/Queen.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -1,11 +1,13 @@
package org.drools.planner.examples.nqueens.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("Queen")
public class Queen extends AbstractPersistable implements Comparable<Queen> {
private int x;
Added: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/persistence/NQueensDaoImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/persistence/NQueensDaoImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/persistence/NQueensDaoImpl.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -0,0 +1,15 @@
+package org.drools.planner.examples.nqueens.persistence;
+
+import org.drools.planner.examples.common.persistence.XstreamSolutionDaoImpl;
+import org.drools.planner.examples.nqueens.domain.NQueens;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class NQueensDaoImpl extends XstreamSolutionDaoImpl {
+
+ public NQueensDaoImpl() {
+ super("nqueens", NQueens.class);
+ }
+
+}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/persistence/NQueensGenerator.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/persistence/NQueensGenerator.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/persistence/NQueensGenerator.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -7,6 +7,7 @@
import javax.swing.JOptionPane;
import org.drools.planner.examples.common.app.LoggingMain;
+import org.drools.planner.examples.common.persistence.SolutionDao;
import org.drools.planner.examples.common.persistence.XstreamSolutionDaoImpl;
import org.drools.planner.examples.nqueens.domain.NQueens;
import org.drools.planner.examples.nqueens.domain.Queen;
@@ -18,14 +19,14 @@
private static final File outputDir = new File("data/nqueens/unsolved/");
- public void main(String[] args) {
+ public static void main(String[] args) {
new NQueensGenerator().generate();
}
public void generate() {
String nString = JOptionPane.showInputDialog("For what n?");
int n = Integer.parseInt(nString.trim());
- XstreamSolutionDaoImpl solutionDao = new XstreamSolutionDaoImpl();
+ SolutionDao solutionDao = new NQueensDaoImpl();
String outputFileName = "unsolvedNQueens" + n + ".xml";
File outputFile = new File(outputDir, outputFileName);
NQueens nQueens = createNQueens(n);
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/app/PatientAdmissionScheduleApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/app/PatientAdmissionScheduleApp.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/app/PatientAdmissionScheduleApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,7 +3,10 @@
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.manners2009.persistence.Manners2009DaoImpl;
+import org.drools.planner.examples.pas.persistence.PatientAdmissionScheduleDaoImpl;
import org.drools.planner.examples.pas.swingui.PatientAdmissionSchedulePanel;
/**
@@ -19,6 +22,11 @@
}
@Override
+ protected SolutionDao createSolutionDao() {
+ return new PatientAdmissionScheduleDaoImpl();
+ }
+
+ @Override
protected Solver createSolver() {
XmlSolverConfigurer configurer = new XmlSolverConfigurer();
configurer.configure(SOLVER_CONFIG);
@@ -26,11 +34,6 @@
}
@Override
- protected String getExampleDirName() {
- return "pas";
- }
-
- @Override
protected SolutionPanel createSolutionPanel() {
return new PatientAdmissionSchedulePanel();
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/app/PatientAdmissionScheduleBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/app/PatientAdmissionScheduleBenchmarkApp.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/app/PatientAdmissionScheduleBenchmarkApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,6 +3,7 @@
import java.io.File;
import org.drools.planner.examples.common.app.CommonBenchmarkApp;
+import org.drools.planner.examples.pas.domain.PatientAdmissionSchedule;
/**
* @author Geoffrey De Smet
@@ -27,7 +28,7 @@
}
public PatientAdmissionScheduleBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
- super(solverBenchmarkConfig, resultFile);
+ super(solverBenchmarkConfig, resultFile, PatientAdmissionSchedule.class);
}
}
\ No newline at end of file
Added: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/persistence/PatientAdmissionScheduleDaoImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/persistence/PatientAdmissionScheduleDaoImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/persistence/PatientAdmissionScheduleDaoImpl.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -0,0 +1,16 @@
+package org.drools.planner.examples.pas.persistence;
+
+import org.drools.planner.examples.common.persistence.XstreamSolutionDaoImpl;
+import org.drools.planner.examples.manners2009.domain.Manners2009;
+import org.drools.planner.examples.pas.domain.PatientAdmissionSchedule;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class PatientAdmissionScheduleDaoImpl extends XstreamSolutionDaoImpl {
+
+ public PatientAdmissionScheduleDaoImpl() {
+ super("pas", PatientAdmissionSchedule.class);
+ }
+
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/persistence/PatientAdmissionScheduleInputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/persistence/PatientAdmissionScheduleInputConvertor.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/persistence/PatientAdmissionScheduleInputConvertor.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -9,6 +9,7 @@
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.pas.domain.AdmissionPart;
import org.drools.planner.examples.pas.domain.Bed;
import org.drools.planner.examples.pas.domain.Department;
@@ -36,8 +37,8 @@
new PatientAdmissionScheduleInputConvertor().convertAll();
}
- protected String getExampleDirName() {
- return "pas";
+ public PatientAdmissionScheduleInputConvertor() {
+ super(new PatientAdmissionScheduleDaoImpl());
}
public InputBuilder createInputBuilder() {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/persistence/PatientAdmissionScheduleOutputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/persistence/PatientAdmissionScheduleOutputConvertor.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/persistence/PatientAdmissionScheduleOutputConvertor.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -18,8 +18,8 @@
new PatientAdmissionScheduleOutputConvertor().convertAll();
}
- protected String getExampleDirName() {
- return "pas";
+ public PatientAdmissionScheduleOutputConvertor() {
+ super(new PatientAdmissionScheduleDaoImpl());
}
public OutputBuilder createOutputBuilder() {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/simple/SimpleTravelingTournamentApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/simple/SimpleTravelingTournamentApp.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/simple/SimpleTravelingTournamentApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -2,7 +2,10 @@
import org.drools.planner.config.XmlSolverConfigurer;
import org.drools.planner.core.Solver;
+import org.drools.planner.examples.common.persistence.SolutionDao;
import org.drools.planner.examples.travelingtournament.app.AbstractTravelingTournamentApp;
+import org.drools.planner.examples.travelingtournament.persistence.simple.SimpleTravelingTournamentDaoImpl;
+import org.drools.planner.examples.travelingtournament.persistence.smart.SmartTravelingTournamentDaoImpl;
/**
* @author Geoffrey De Smet
@@ -17,14 +20,15 @@
}
@Override
+ protected SolutionDao createSolutionDao() {
+ return new SimpleTravelingTournamentDaoImpl();
+ }
+
+ @Override
protected Solver createSolver() {
XmlSolverConfigurer configurer = new XmlSolverConfigurer();
configurer.configure(SOLVER_CONFIG);
return configurer.buildSolver();
}
- @Override
- protected String getExampleDirName() {
- return "travelingtournament/simple";
- }
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/smart/SmartTravelingTournamentApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/smart/SmartTravelingTournamentApp.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/smart/SmartTravelingTournamentApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -2,7 +2,9 @@
import org.drools.planner.config.XmlSolverConfigurer;
import org.drools.planner.core.Solver;
+import org.drools.planner.examples.common.persistence.SolutionDao;
import org.drools.planner.examples.travelingtournament.app.AbstractTravelingTournamentApp;
+import org.drools.planner.examples.travelingtournament.persistence.smart.SmartTravelingTournamentDaoImpl;
/**
* @author Geoffrey De Smet
@@ -18,15 +20,15 @@
}
@Override
+ protected SolutionDao createSolutionDao() {
+ return new SmartTravelingTournamentDaoImpl();
+ }
+
+ @Override
protected Solver createSolver() {
XmlSolverConfigurer configurer = new XmlSolverConfigurer();
configurer.configure(SOLVER_CONFIG);
return configurer.buildSolver();
}
- @Override
- protected String getExampleDirName() {
- return "travelingtournament/smart";
- }
-
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/smart/SmartTravelingTournamentBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/smart/SmartTravelingTournamentBenchmarkApp.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/smart/SmartTravelingTournamentBenchmarkApp.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,6 +3,7 @@
import java.io.File;
import org.drools.planner.examples.common.app.CommonBenchmarkApp;
+import org.drools.planner.examples.travelingtournament.domain.TravelingTournament;
/**
* @author Geoffrey De Smet
@@ -28,7 +29,7 @@
}
public SmartTravelingTournamentBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
- super(solverBenchmarkConfig, resultFile);
+ super(solverBenchmarkConfig, resultFile, TravelingTournament.class);
}
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/TravelingTournamentInputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/TravelingTournamentInputConvertor.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/TravelingTournamentInputConvertor.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -7,6 +7,7 @@
import java.util.StringTokenizer;
import org.drools.planner.examples.common.persistence.AbstractInputConvertor;
+import org.drools.planner.examples.common.persistence.SolutionDao;
import org.drools.planner.examples.travelingtournament.domain.Day;
import org.drools.planner.examples.travelingtournament.domain.Match;
import org.drools.planner.examples.travelingtournament.domain.Team;
@@ -18,8 +19,8 @@
*/
public abstract class TravelingTournamentInputConvertor extends AbstractInputConvertor {
- protected String getExampleDirName() {
- return "travelingtournament";
+ protected TravelingTournamentInputConvertor(SolutionDao solutionDao) {
+ super(solutionDao);
}
public abstract class TravelingTournamentInputBuilder extends InputBuilder {
Added: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/simple/SimpleTravelingTournamentDaoImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/simple/SimpleTravelingTournamentDaoImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/simple/SimpleTravelingTournamentDaoImpl.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -0,0 +1,15 @@
+package org.drools.planner.examples.travelingtournament.persistence.simple;
+
+import org.drools.planner.examples.common.persistence.XstreamSolutionDaoImpl;
+import org.drools.planner.examples.travelingtournament.domain.TravelingTournament;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class SimpleTravelingTournamentDaoImpl extends XstreamSolutionDaoImpl {
+
+ public SimpleTravelingTournamentDaoImpl() {
+ super("travelingtournament/simple", TravelingTournament.class);
+ }
+
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/simple/SimpleTravelingTournamentInputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/simple/SimpleTravelingTournamentInputConvertor.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/simple/SimpleTravelingTournamentInputConvertor.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,6 +3,7 @@
import java.io.File;
import java.util.List;
+import org.drools.planner.examples.common.persistence.SolutionDao;
import org.drools.planner.examples.travelingtournament.domain.Day;
import org.drools.planner.examples.travelingtournament.domain.Match;
import org.drools.planner.examples.travelingtournament.domain.TravelingTournament;
@@ -17,11 +18,8 @@
new SimpleTravelingTournamentInputConvertor().convertAll();
}
- private final File outputDir = new File("data/travelingtournament/simple/unsolved/");
-
- @Override
- protected File getOutputDir() {
- return outputDir;
+ public SimpleTravelingTournamentInputConvertor() {
+ super(new SimpleTravelingTournamentDaoImpl());
}
public InputBuilder createInputBuilder() {
Added: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/smart/SmartTravelingTournamentDaoImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/smart/SmartTravelingTournamentDaoImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/smart/SmartTravelingTournamentDaoImpl.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -0,0 +1,15 @@
+package org.drools.planner.examples.travelingtournament.persistence.smart;
+
+import org.drools.planner.examples.common.persistence.XstreamSolutionDaoImpl;
+import org.drools.planner.examples.travelingtournament.domain.TravelingTournament;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class SmartTravelingTournamentDaoImpl extends XstreamSolutionDaoImpl {
+
+ public SmartTravelingTournamentDaoImpl() {
+ super("travelingtournament/smart", TravelingTournament.class);
+ }
+
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/smart/SmartTravelingTournamentInputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/smart/SmartTravelingTournamentInputConvertor.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/smart/SmartTravelingTournamentInputConvertor.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -3,6 +3,7 @@
import java.io.File;
import java.util.List;
+import org.drools.planner.examples.common.persistence.SolutionDao;
import org.drools.planner.examples.travelingtournament.domain.Match;
import org.drools.planner.examples.travelingtournament.domain.Team;
import org.drools.planner.examples.travelingtournament.domain.TravelingTournament;
@@ -17,11 +18,8 @@
new SmartTravelingTournamentInputConvertor().convertAll();
}
- private final File outputDir = new File("data/travelingtournament/smart/unsolved/");
-
- @Override
- protected File getOutputDir() {
- return outputDir;
+ public SmartTravelingTournamentInputConvertor() {
+ super(new SmartTravelingTournamentDaoImpl());
}
public InputBuilder createInputBuilder() {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/smart/SmartTravelingTournamentOutputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/smart/SmartTravelingTournamentOutputConvertor.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/persistence/smart/SmartTravelingTournamentOutputConvertor.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -4,6 +4,7 @@
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.travelingtournament.domain.TravelingTournament;
import org.drools.planner.examples.travelingtournament.domain.Team;
import org.drools.planner.examples.travelingtournament.domain.Match;
@@ -21,18 +22,11 @@
new SmartTravelingTournamentOutputConvertor().convertAll();
}
- private final File inputDir = new File("data/travelingtournament/smart/solved/");
-
- protected String getExampleDirName() {
- return "travelingtournament/smart";
+ public SmartTravelingTournamentOutputConvertor() {
+ super(new SmartTravelingTournamentDaoImpl());
}
@Override
- protected File getInputDir() {
- return inputDir;
- }
-
- @Override
protected String getOutputFileSuffix() {
return OUTPUT_FILE_SUFFIX;
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nqueens/NQueensSmokeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nqueens/NQueensSmokeTest.java 2009-12-18 15:51:09 UTC (rev 30773)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nqueens/NQueensSmokeTest.java 2009-12-18 16:13:07 UTC (rev 30774)
@@ -6,8 +6,8 @@
import org.drools.planner.core.score.DefaultSimpleScore;
import org.drools.planner.core.solution.Solution;
import org.drools.planner.config.XmlSolverConfigurer;
-import org.drools.planner.examples.common.persistence.XstreamSolutionDaoImpl;
import org.drools.planner.examples.common.persistence.SolutionDao;
+import org.drools.planner.examples.nqueens.persistence.NQueensDaoImpl;
/**
* @author Geoffrey De Smet
@@ -24,7 +24,7 @@
XmlSolverConfigurer configurer = new XmlSolverConfigurer();
configurer.configure(SOLVER_CONFIG);
Solver solver = configurer.buildSolver();
- SolutionDao solutionDao = new XstreamSolutionDaoImpl();
+ SolutionDao solutionDao = new NQueensDaoImpl();
Solution startingSolution = solutionDao.readSolution(getClass().getResourceAsStream(UNSOLVED_DATA));
solver.setStartingSolution(startingSolution);
solver.solve();
More information about the jboss-svn-commits
mailing list