[jboss-svn-commits] JBL Code SVN: r31663 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination: solver and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Feb 14 14:18:58 EST 2010
Author: ge0ffrey
Date: 2010-02-14 14:18:58 -0500 (Sun, 14 Feb 2010)
New Revision: 31663
Modified:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationSolverConfig.xml
Log:
custom Selector performs better
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml 2010-02-14 18:59:12 UTC (rev 31662)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml 2010-02-14 19:18:58 UTC (rev 31663)
@@ -33,7 +33,7 @@
</inheritedLocalSearchSolver>
<solverBenchmark>
- <name>relative0.002_solutionTabu500_propertyTabu10</name>
+ <name>absolute500_propertyTabu10</name>
<localSearchSolver>
<deciderScoreComparatorFactory>
<deciderScoreComparatorFactoryType>NATURAL</deciderScoreComparatorFactoryType>
@@ -41,19 +41,19 @@
<selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
- <relativeSelection>0.002</relativeSelection>
+ <absoluteSelection>500</absoluteSelection>
</selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
- <relativeSelection>0.002</relativeSelection>
+ <absoluteSelection>500</absoluteSelection>
</selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
- <relativeSelection>0.002</relativeSelection>
+ <absoluteSelection>500</absoluteSelection>
</selector>
</selector>
<acceptor>
- <completeSolutionTabuSize>500</completeSolutionTabuSize>
+ <completeSolutionTabuSize>1000</completeSolutionTabuSize>
<completePropertyTabuSize>10</completePropertyTabuSize>
</acceptor>
<forager>
@@ -62,7 +62,7 @@
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
- <name>relative0.004_solutionTabu500_propertyTabu10</name>
+ <name>absolute500_moveTabu7</name>
<localSearchSolver>
<deciderScoreComparatorFactory>
<deciderScoreComparatorFactoryType>NATURAL</deciderScoreComparatorFactoryType>
@@ -70,19 +70,49 @@
<selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
- <relativeSelection>0.004</relativeSelection>
+ <absoluteSelection>500</absoluteSelection>
</selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
- <relativeSelection>0.004</relativeSelection>
+ <absoluteSelection>500</absoluteSelection>
</selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
- <relativeSelection>0.004</relativeSelection>
+ <absoluteSelection>500</absoluteSelection>
</selector>
</selector>
<acceptor>
- <completeSolutionTabuSize>500</completeSolutionTabuSize>
+ <completeSolutionTabuSize>1000</completeSolutionTabuSize>
+ <completeMoveTabuSize>7</completeMoveTabuSize>
+ </acceptor>
+ <forager>
+ <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ </forager>
+ </localSearchSolver>
+ </solverBenchmark>
+ <solverBenchmark>
+ <name>absolute500WithCustomSelector_propertyTabu10</name>
+ <localSearchSolver>
+ <deciderScoreComparatorFactory>
+ <deciderScoreComparatorFactoryType>NATURAL</deciderScoreComparatorFactoryType>
+ </deciderScoreComparatorFactory>
+ <selector>
+ <selector class="org.drools.planner.examples.examination.solver.selector.AllMovesOfOneExamSelectorConfig"/>
+ <selector>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+ <absoluteSelection>500</absoluteSelection>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+ <absoluteSelection>500</absoluteSelection>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
+ <absoluteSelection>500</absoluteSelection>
+ </selector>
+ </selector>
+ <acceptor>
+ <completeSolutionTabuSize>1000</completeSolutionTabuSize>
<completePropertyTabuSize>10</completePropertyTabuSize>
</acceptor>
<forager>
@@ -91,27 +121,28 @@
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
- <name>relative0.002_solutionTabu500_moveTabu7</name>
+ <name>absolute500WithCustomSelector_moveTabu7</name>
<localSearchSolver>
<deciderScoreComparatorFactory>
<deciderScoreComparatorFactoryType>NATURAL</deciderScoreComparatorFactoryType>
</deciderScoreComparatorFactory>
<selector>
+ <selector class="org.drools.planner.examples.examination.solver.selector.AllMovesOfOneExamSelectorConfig"/>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
- <relativeSelection>0.002</relativeSelection>
+ <absoluteSelection>500</absoluteSelection>
</selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
- <relativeSelection>0.002</relativeSelection>
+ <absoluteSelection>500</absoluteSelection>
</selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
- <relativeSelection>0.002</relativeSelection>
+ <absoluteSelection>500</absoluteSelection>
</selector>
</selector>
<acceptor>
- <completeSolutionTabuSize>500</completeSolutionTabuSize>
+ <completeSolutionTabuSize>1000</completeSolutionTabuSize>
<completeMoveTabuSize>7</completeMoveTabuSize>
</acceptor>
<forager>
@@ -120,25 +151,29 @@
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
- <name>noRelative_solutionTabu500_propertyTabu10</name>
+ <name>absolute300WithCustomSelector_moveTabu7</name>
<localSearchSolver>
<deciderScoreComparatorFactory>
<deciderScoreComparatorFactoryType>NATURAL</deciderScoreComparatorFactoryType>
</deciderScoreComparatorFactory>
<selector>
+ <selector class="org.drools.planner.examples.examination.solver.selector.AllMovesOfOneExamSelectorConfig"/>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+ <absoluteSelection>300</absoluteSelection>
</selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+ <absoluteSelection>300</absoluteSelection>
</selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
+ <absoluteSelection>300</absoluteSelection>
</selector>
</selector>
<acceptor>
- <completeSolutionTabuSize>500</completeSolutionTabuSize>
- <completePropertyTabuSize>10</completePropertyTabuSize>
+ <completeSolutionTabuSize>1000</completeSolutionTabuSize>
+ <completeMoveTabuSize>7</completeMoveTabuSize>
</acceptor>
<forager>
<foragerType>MAX_SCORE_OF_ALL</foragerType>
@@ -146,7 +181,7 @@
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
- <name>simmulatedAnnealing</name>
+ <name>relative0.002_moveTabu7</name>
<localSearchSolver>
<deciderScoreComparatorFactory>
<deciderScoreComparatorFactoryType>NATURAL</deciderScoreComparatorFactoryType>
@@ -154,24 +189,28 @@
<selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
</selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
</selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
</selector>
</selector>
<acceptor>
- <acceptorType>SIMULATED_ANNEALING</acceptorType>
+ <completeSolutionTabuSize>1000</completeSolutionTabuSize>
+ <completeMoveTabuSize>7</completeMoveTabuSize>
</acceptor>
<forager>
- <foragerType>FIRST_RANDOMLY_ACCEPTED</foragerType>
+ <foragerType>MAX_SCORE_OF_ALL</foragerType>
</forager>
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
- <name>absolute500_solutionTabu500_propertyTabu10</name>
+ <name>simulatedAnnealing</name>
<localSearchSolver>
<deciderScoreComparatorFactory>
<deciderScoreComparatorFactoryType>NATURAL</deciderScoreComparatorFactoryType>
@@ -179,23 +218,19 @@
<selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
- <absoluteSelection>500</absoluteSelection>
</selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
- <absoluteSelection>500</absoluteSelection>
</selector>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.ExamSwitchMoveFactory</moveFactoryClass>
- <absoluteSelection>500</absoluteSelection>
</selector>
</selector>
<acceptor>
- <completeSolutionTabuSize>500</completeSolutionTabuSize>
- <completePropertyTabuSize>10</completePropertyTabuSize>
+ <acceptorType>SIMULATED_ANNEALING</acceptorType>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <foragerType>FIRST_RANDOMLY_ACCEPTED</foragerType>
</forager>
</localSearchSolver>
</solverBenchmark>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationSolverConfig.xml 2010-02-14 18:59:12 UTC (rev 31662)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationSolverConfig.xml 2010-02-14 19:18:58 UTC (rev 31663)
@@ -28,7 +28,7 @@
<!--<selector>-->
<!--<topSize>10</topSize>-->
<!--</selector>-->
- <!--<selector class="org.drools.planner.examples.examination.solver.selector.AllMovesOfOneExamSelectorConfig"/>-->
+ <selector class="org.drools.planner.examples.examination.solver.selector.AllMovesOfOneExamSelectorConfig"/>
<selector>
<moveFactoryClass>org.drools.planner.examples.examination.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
<absoluteSelection>500</absoluteSelection>
More information about the jboss-svn-commits
mailing list