[jboss-svn-commits] JBL Code SVN: r32739 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main: java/org/drools/planner/examples/nurserostering/app and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 5 06:48:19 EDT 2010
Author: ge0ffrey
Date: 2010-05-05 06:48:18 -0400 (Wed, 05 May 2010)
New Revision: 32739
Added:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml
Removed:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationShortSolverBenchmarkConfig.xml
Modified:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/app/NurseRosteringBenchmarkApp.java
Log:
stepLimit
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationBenchmarkApp.java 2010-05-05 10:08:41 UTC (rev 32738)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationBenchmarkApp.java 2010-05-05 10:48:18 UTC (rev 32739)
@@ -12,16 +12,22 @@
public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml";
- public static final String SHORT_SOLVER_BENCHMARK_CONFIG
- = "/org/drools/planner/examples/examination/benchmark/examinationShortSolverBenchmarkConfig.xml";
+ public static final String STEP_LIMIT_SOLVER_BENCHMARK_CONFIG
+ = "/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml";
public static final File SOLVER_BENCHMARK_RESULT_FILE
= new File("local/data/examination/examinationSolverBenchmarkResult.xml");
public static void main(String[] args) {
String solverConfig;
- if (args.length > 0 && args[0].equals("short")) {
- solverConfig = SHORT_SOLVER_BENCHMARK_CONFIG;
+ if (args.length > 0) {
+ if (args[0].equals("default")) {
+ solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
+ } else if (args[0].equals("stepLimit")) {
+ solverConfig = STEP_LIMIT_SOLVER_BENCHMARK_CONFIG;
+ } else {
+ throw new IllegalArgumentException("The program argument (" + args[0] + ") is not supported.");
+ }
} else {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/app/NurseRosteringBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/app/NurseRosteringBenchmarkApp.java 2010-05-05 10:08:41 UTC (rev 32738)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/app/NurseRosteringBenchmarkApp.java 2010-05-05 10:48:18 UTC (rev 32739)
@@ -16,6 +16,8 @@
= "/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringMediumSolverBenchmarkConfig.xml";
public static final String LONG_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringLongSolverBenchmarkConfig.xml";
+ public static final String STEP_LIMIT_SOLVER_BENCHMARK_CONFIG
+ = "/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml";
public static final File SOLVER_BENCHMARK_RESULT_FILE
= new File("local/data/nurserostering/nurseRosteringSolverBenchmarkResult.xml");
@@ -29,6 +31,8 @@
solverConfig = MEDIUM_SOLVER_BENCHMARK_CONFIG;
} else if (args[0].equals("long")) {
solverConfig = LONG_SOLVER_BENCHMARK_CONFIG;
+ } else if (args[0].equals("stepLimit")) {
+ solverConfig = STEP_LIMIT_SOLVER_BENCHMARK_CONFIG;
} else {
throw new IllegalArgumentException("The program argument (" + args[0] + ") is not supported.");
}
Deleted: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationShortSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationShortSolverBenchmarkConfig.xml 2010-05-05 10:08:41 UTC (rev 32738)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationShortSolverBenchmarkConfig.xml 2010-05-05 10:48:18 UTC (rev 32739)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/examination/solved</solvedSolutionFilesDirectory>
- <solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
- <solverStatisticFilesDirectory>local/data/examination/statistic</solverStatisticFilesDirectory>
-
- <inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set1_initialized.xml</inheritedUnsolvedSolutionFile>
- <inheritedLocalSearchSolver>
- <scoreDrl>/org/drools/planner/examples/examination/solver/examinationScoreRules.drl</scoreDrl>
- <startingSolutionInitializerClass>org.drools.planner.examples.examination.solver.solution.initializer.ExaminationStartingSolutionInitializer</startingSolutionInitializerClass>
- <termination>
- <maximumStepCount>70</maximumStepCount>
- </termination>
- </inheritedLocalSearchSolver>
-
- <solverBenchmark>
- <localSearchSolver>
- <scoreDefinition>
- <scoreDefinitionType>HARD_AND_SOFT</scoreDefinitionType>
- </scoreDefinition>
- <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>
- </acceptor>
- <forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
- </forager>
- </localSearchSolver>
- </solverBenchmark>
-</solverBenchmarkSuite>
Copied: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml (from rev 32692, labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationShortSolverBenchmarkConfig.xml)
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml 2010-05-05 10:48:18 UTC (rev 32739)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solverBenchmarkSuite>
+ <solvedSolutionFilesDirectory>local/data/examination/solved</solvedSolutionFilesDirectory>
+ <solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
+ <solverStatisticFilesDirectory>local/data/examination/statistic</solverStatisticFilesDirectory>
+
+ <inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set1_initialized.xml</inheritedUnsolvedSolutionFile>
+
+ <inheritedLocalSearchSolver>
+ <scoreDrl>/org/drools/planner/examples/examination/solver/examinationScoreRules.drl</scoreDrl>
+ <scoreDefinition>
+ <scoreDefinitionType>HARD_AND_SOFT</scoreDefinitionType>
+ </scoreDefinition>
+ <startingSolutionInitializerClass>org.drools.planner.examples.examination.solver.solution.initializer.ExaminationStartingSolutionInitializer</startingSolutionInitializerClass>
+ <termination>
+ <maximumStepCount>70</maximumStepCount>
+ </termination>
+ </inheritedLocalSearchSolver>
+
+ <solverBenchmark>
+ <localSearchSolver>
+ <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>1000</completeSolutionTabuSize>
+ <completePropertyTabuSize>10</completePropertyTabuSize>
+ </acceptor>
+ <forager>
+ <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ </forager>
+ </localSearchSolver>
+ </solverBenchmark>
+</solverBenchmarkSuite>
Copied: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml (from rev 32735, labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringMediumSolverBenchmarkConfig.xml)
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml 2010-05-05 10:48:18 UTC (rev 32739)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solverBenchmarkSuite>
+ <solvedSolutionFilesDirectory>local/data/nurserostering/solved</solvedSolutionFilesDirectory>
+ <solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
+ <solverStatisticFilesDirectory>local/data/nurserostering/statistic</solverStatisticFilesDirectory>
+
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/medium01_initialized.xml</inheritedUnsolvedSolutionFile>
+
+ <inheritedLocalSearchSolver>
+ <scoreDrl>/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl</scoreDrl>
+ <scoreDefinition>
+ <scoreDefinitionType>HARD_AND_SOFT</scoreDefinitionType>
+ </scoreDefinition>
+ <startingSolutionInitializerClass>org.drools.planner.examples.nurserostering.solver.solution.initializer.NurseRosteringStartingSolutionInitializer</startingSolutionInitializerClass>
+ <termination>
+ <maximumStepCount>100</maximumStepCount>
+ </termination>
+ </inheritedLocalSearchSolver>
+
+ <solverBenchmark>
+ <localSearchSolver>
+ <selector>
+ <selector>
+ <moveFactoryClass>org.drools.planner.examples.nurserostering.solver.move.factory.EmployeeChangeMoveFactory</moveFactoryClass>
+ <absoluteSelection>500</absoluteSelection>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.planner.examples.nurserostering.solver.move.factory.EmployeeAssignmentSwitchMoveFactory</moveFactoryClass>
+ <absoluteSelection>500</absoluteSelection>
+ </selector>
+ </selector>
+ <acceptor>
+ <completeSolutionTabuSize>1000</completeSolutionTabuSize>
+ <completeMoveTabuSize>7</completeMoveTabuSize>
+ </acceptor>
+ <forager>
+ <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ </forager>
+ </localSearchSolver>
+ </solverBenchmark>
+</solverBenchmarkSuite>
More information about the jboss-svn-commits
mailing list