[jboss-svn-commits] JBL Code SVN: r27801 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main: resources/org/drools/solver/examples/pas/benchmark and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 9 15:36:45 EDT 2009
Author: ge0ffrey
Date: 2009-07-09 15:36:45 -0400 (Thu, 09 Jul 2009)
New Revision: 27801
Modified:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/pas/solver/solution/initializer/PatientAdmissionScheduleStartingSolutionInitializer.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml
Log:
pas: initializer weight sorting yet another improvement
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/pas/solver/solution/initializer/PatientAdmissionScheduleStartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/pas/solver/solution/initializer/PatientAdmissionScheduleStartingSolutionInitializer.java 2009-07-09 19:36:36 UTC (rev 27800)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/pas/solver/solution/initializer/PatientAdmissionScheduleStartingSolutionInitializer.java 2009-07-09 19:36:45 UTC (rev 27801)
@@ -114,7 +114,8 @@
for (Room room : patientAdmissionSchedule.getRoomList()) {
weight += (room.getCapacity() * room.countDisallowedAdmissionPart(admissionPart));
}
- weight *= bedDesignation.getAdmissionPart().getNightCount();
+ weight *= 1000;
+ weight += bedDesignation.getAdmissionPart().getNightCount();
initializationWeightList.add(new BedDesignationInitializationWeight(bedDesignation, weight));
}
Collections.sort(initializationWeightList);
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-09 19:36:36 UTC (rev 27800)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml 2009-07-09 19:36:45 UTC (rev 27801)
@@ -5,12 +5,12 @@
<sortSolverBenchmarks>true</sortSolverBenchmarks>
<!-- solverBenchmarkResultComparator -->
- <!--<inheritedUnsolvedSolutionFile>data/pas/unsolved/testdata01.xml</inheritedUnsolvedSolutionFile>-->
+ <inheritedUnsolvedSolutionFile>data/pas/unsolved/testdata01.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/pas/unsolved/testdata02.xml</inheritedUnsolvedSolutionFile>
- <!--<inheritedUnsolvedSolutionFile>data/pas/unsolved/testdata03.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/pas/unsolved/testdata04.xml</inheritedUnsolvedSolutionFile>-->
+ <inheritedUnsolvedSolutionFile>data/pas/unsolved/testdata03.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/pas/unsolved/testdata04.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/pas/unsolved/testdata05.xml</inheritedUnsolvedSolutionFile>
- <!--<inheritedUnsolvedSolutionFile>data/pas/unsolved/testdata06.xml</inheritedUnsolvedSolutionFile>-->
+ <inheritedUnsolvedSolutionFile>data/pas/unsolved/testdata06.xml</inheritedUnsolvedSolutionFile>
<inheritedLocalSearchSolver>
<scoreDrl>/org/drools/solver/examples/pas/solver/patientAdmissionScheduleScoreRules.drl</scoreDrl>
@@ -23,7 +23,7 @@
On Geoffrey De Smet's PC: 372 (short run), 3720 (long run).
On Peter Demeester's PC: 300 (short run), 3000 (long run).
-->
- <maximumSecondsSpend>3720</maximumSecondsSpend>
+ <maximumSecondsSpend>1</maximumSecondsSpend>
</finish>
</inheritedLocalSearchSolver>
@@ -44,251 +44,4 @@
</forager>
</localSearchSolver>
</solverBenchmark>
- <solverBenchmark>
- <name>relativeSelection more</name>
- <localSearchSolver>
- <selector>
- <selector>
- <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationPillarPartSwitchMoveFactory</moveFactoryClass>
- <relativeSelection>0.0010</relativeSelection>
- </selector>
- </selector>
- <accepter>
- <completeSolutionTabuSize>1000</completeSolutionTabuSize>
- </accepter>
- <forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
- </forager>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <name>relativeSelection much more</name>
- <localSearchSolver>
- <selector>
- <selector>
- <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.BedDesignationPillarPartSwitchMoveFactory</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 much less</name>
- <localSearchSolver>
- <selector>
- <selector>
- <moveFactoryClass>org.drools.solver.examples.pas.solver.move.factory.BedDesignationPillarPartSwitchMoveFactory</moveFactoryClass>
- <relativeSelection>0.0004</relativeSelection>
- </selector>
- </selector>
- <accepter>
- <completeSolutionTabuSize>1000</completeSolutionTabuSize>
- </accepter>
- <forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
- </forager>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <name>completeMoveTabuSize 3</name>
- <localSearchSolver>
- <selector>
- <selector>
- <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.BedDesignationPillarPartSwitchMoveFactory</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>
- <solverBenchmark>
- <name>completeUndoMoveTabuSize 3</name>
- <localSearchSolver>
- <selector>
- <selector>
- <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.BedDesignationPillarPartSwitchMoveFactory</moveFactoryClass>
- <relativeSelection>0.0008</relativeSelection>
- </selector>
- </selector>
- <accepter>
- <completeSolutionTabuSize>1000</completeSolutionTabuSize>
- <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>
More information about the jboss-svn-commits
mailing list