[jboss-svn-commits] JBL Code SVN: r27758 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas: solver and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 8 15:03:36 EDT 2009
Author: ge0ffrey
Date: 2009-07-08 15:03:36 -0400 (Wed, 08 Jul 2009)
New Revision: 27758
Modified:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/solver/patientAdmissionScheduleSolverConfig.xml
Log:
pas: some benchmark tweaks... but the big bang will come soon :)
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml 2009-07-08 18:59:55 UTC (rev 27757)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml 2009-07-08 19:03:36 UTC (rev 27758)
@@ -32,12 +32,25 @@
<localSearchSolver>
<selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationPillarPartSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.0008</relativeSelection>
</selector>
+ </selector>
+ <accepter>
+ <completeSolutionTabuSize>1000</completeSolutionTabuSize>
+ </accepter>
+ <forager>
+ <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ </forager>
+ </localSearchSolver>
+ </solverBenchmark>
+ <solverBenchmark>
+ <name>relativeSelection more</name>
+ <localSearchSolver>
+ <selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>
- <relativeSelection>0.0008</relativeSelection>
+ <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationPillarPartSwitchMoveFactory</moveFactoryClass>
+ <relativeSelection>0.0010</relativeSelection>
</selector>
</selector>
<accepter>
@@ -49,15 +62,28 @@
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
- <name>relativeSelection less</name>
+ <name>relativeSelection much more</name>
<localSearchSolver>
<selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>
- <relativeSelection>0.0007</relativeSelection>
+ <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationPillarPartSwitchMoveFactory</moveFactoryClass>
+ <relativeSelection>0.0020</relativeSelection>
</selector>
+ </selector>
+ <accepter>
+ <completeSolutionTabuSize>1000</completeSolutionTabuSize>
+ </accepter>
+ <forager>
+ <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ </forager>
+ </localSearchSolver>
+ </solverBenchmark>
+ <solverBenchmark>
+ <name>relativeSelection less</name>
+ <localSearchSolver>
+ <selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationPillarPartSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.0007</relativeSelection>
</selector>
</selector>
@@ -70,17 +96,13 @@
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
- <name>relativeSelection more</name>
+ <name>relativeSelection much less</name>
<localSearchSolver>
<selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>
- <relativeSelection>0.0010</relativeSelection>
+ <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationPillarPartSwitchMoveFactory</moveFactoryClass>
+ <relativeSelection>0.0004</relativeSelection>
</selector>
- <selector>
- <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>
- <relativeSelection>0.0010</relativeSelection>
- </selector>
</selector>
<accepter>
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
@@ -91,21 +113,35 @@
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
- <name>completeMoveTabuSize 5</name>
+ <name>completeMoveTabuSize 3</name>
<localSearchSolver>
<selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationPillarPartSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.0008</relativeSelection>
</selector>
+ </selector>
+ <accepter>
+ <completeSolutionTabuSize>1000</completeSolutionTabuSize>
+ <completeMoveTabuSize>3</completeMoveTabuSize>
+ </accepter>
+ <forager>
+ <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ </forager>
+ </localSearchSolver>
+ </solverBenchmark>
+ <solverBenchmark>
+ <name>completeMoveTabuSize 7</name>
+ <localSearchSolver>
+ <selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationPillarPartSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.0008</relativeSelection>
</selector>
</selector>
<accepter>
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
- <completeMoveTabuSize>5</completeMoveTabuSize>
+ <completeMoveTabuSize>7</completeMoveTabuSize>
</accepter>
<forager>
<foragerType>MAX_SCORE_OF_ALL</foragerType>
@@ -113,25 +149,146 @@
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
- <name>completeMoveTabuSize 7</name>
+ <name>completeUndoMoveTabuSize 3</name>
<localSearchSolver>
<selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationPillarPartSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.0008</relativeSelection>
</selector>
+ </selector>
+ <accepter>
+ <completeSolutionTabuSize>1000</completeSolutionTabuSize>
+ <completeUndoMoveTabuSize>3</completeUndoMoveTabuSize>
+ </accepter>
+ <forager>
+ <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ </forager>
+ </localSearchSolver>
+ </solverBenchmark>
+ <solverBenchmark>
+ <name>completeUndoMoveTabuSize 7</name>
+ <localSearchSolver>
+ <selector>
<selector>
- <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>
+ <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationPillarPartSwitchMoveFactory</moveFactoryClass>
<relativeSelection>0.0008</relativeSelection>
</selector>
</selector>
<accepter>
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
- <completeMoveTabuSize>7</completeMoveTabuSize>
+ <completeUndoMoveTabuSize>7</completeUndoMoveTabuSize>
</accepter>
<forager>
<foragerType>MAX_SCORE_OF_ALL</foragerType>
</forager>
</localSearchSolver>
</solverBenchmark>
+ <!--<solverBenchmark>-->
+ <!--<name>basis</name>-->
+ <!--<localSearchSolver>-->
+ <!--<selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>-->
+ <!--<relativeSelection>0.0008</relativeSelection>-->
+ <!--</selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>-->
+ <!--<relativeSelection>0.0008</relativeSelection>-->
+ <!--</selector>-->
+ <!--</selector>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1000</completeSolutionTabuSize>-->
+ <!--</accepter>-->
+ <!--<forager>-->
+ <!--<foragerType>MAX_SCORE_OF_ALL</foragerType>-->
+ <!--</forager>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<name>relativeSelection less</name>-->
+ <!--<localSearchSolver>-->
+ <!--<selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>-->
+ <!--<relativeSelection>0.0007</relativeSelection>-->
+ <!--</selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>-->
+ <!--<relativeSelection>0.0007</relativeSelection>-->
+ <!--</selector>-->
+ <!--</selector>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1000</completeSolutionTabuSize>-->
+ <!--</accepter>-->
+ <!--<forager>-->
+ <!--<foragerType>MAX_SCORE_OF_ALL</foragerType>-->
+ <!--</forager>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<name>relativeSelection more</name>-->
+ <!--<localSearchSolver>-->
+ <!--<selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>-->
+ <!--<relativeSelection>0.0010</relativeSelection>-->
+ <!--</selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>-->
+ <!--<relativeSelection>0.0010</relativeSelection>-->
+ <!--</selector>-->
+ <!--</selector>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1000</completeSolutionTabuSize>-->
+ <!--</accepter>-->
+ <!--<forager>-->
+ <!--<foragerType>MAX_SCORE_OF_ALL</foragerType>-->
+ <!--</forager>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<name>completeMoveTabuSize 5</name>-->
+ <!--<localSearchSolver>-->
+ <!--<selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>-->
+ <!--<relativeSelection>0.0008</relativeSelection>-->
+ <!--</selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>-->
+ <!--<relativeSelection>0.0008</relativeSelection>-->
+ <!--</selector>-->
+ <!--</selector>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1000</completeSolutionTabuSize>-->
+ <!--<completeMoveTabuSize>5</completeMoveTabuSize>-->
+ <!--</accepter>-->
+ <!--<forager>-->
+ <!--<foragerType>MAX_SCORE_OF_ALL</foragerType>-->
+ <!--</forager>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<name>completeMoveTabuSize 7</name>-->
+ <!--<localSearchSolver>-->
+ <!--<selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>-->
+ <!--<relativeSelection>0.0008</relativeSelection>-->
+ <!--</selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>-->
+ <!--<relativeSelection>0.0008</relativeSelection>-->
+ <!--</selector>-->
+ <!--</selector>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1000</completeSolutionTabuSize>-->
+ <!--<completeMoveTabuSize>7</completeMoveTabuSize>-->
+ <!--</accepter>-->
+ <!--<forager>-->
+ <!--<foragerType>MAX_SCORE_OF_ALL</foragerType>-->
+ <!--</forager>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
</solverBenchmarkSuite>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/solver/patientAdmissionScheduleSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/solver/patientAdmissionScheduleSolverConfig.xml 2009-07-08 18:59:55 UTC (rev 27757)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/solver/patientAdmissionScheduleSolverConfig.xml 2009-07-08 19:03:36 UTC (rev 27758)
@@ -23,12 +23,12 @@
<!--</selector>-->
<selector>
<moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationPillarPartSwitchMoveFactory</moveFactoryClass>
- <relativeSelection>0.0008</relativeSelection>
+ <relativeSelection>0.0010</relativeSelection>
</selector>
</selector>
<accepter>
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
- <!--<completeMoveTabuSize>7</completeMoveTabuSize>-->
+ <completeUndoMoveTabuSize>3</completeUndoMoveTabuSize>
</accepter>
<forager>
<foragerType>MAX_SCORE_OF_ALL</foragerType>
More information about the jboss-svn-commits
mailing list