[jboss-svn-commits] JBL Code SVN: r18439 - in labs/jbossrules/trunk/drools-solver: drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/app and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Feb 9 10:15:46 EST 2008
Author: ge0ffrey
Date: 2008-02-09 10:15:46 -0500 (Sat, 09 Feb 2008)
New Revision: 18439
Modified:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/app/ExaminationBenchmarkApp.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-solver/pom.xml
Log:
depend on trunk + benchmark short
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/app/ExaminationBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/app/ExaminationBenchmarkApp.java 2008-02-09 11:45:13 UTC (rev 18438)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/app/ExaminationBenchmarkApp.java 2008-02-09 15:15:46 UTC (rev 18439)
@@ -10,15 +10,21 @@
*/
public class ExaminationBenchmarkApp extends CommonBenchmarkApp {
- public static final String SOLVER_BENCHMARK_CONFIG
+ public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml";
-// public static final String SOLVER_BENCHMARK_CONFIG
-// = "/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml";
+ public static final String SHORT_SOLVER_BENCHMARK_CONFIG
+ = "/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml";
public static final File SOLVER_BENCHMARK_RESULT_FILE
= new File("local/data/itc2007/examination/examinationSolverBenchmarkResult.xml");
public static void main(String[] args) {
- new NQueensBenchmarkApp(SOLVER_BENCHMARK_CONFIG, SOLVER_BENCHMARK_RESULT_FILE).process();
+ String solverConfig;
+ if (args.length > 0 && args[0].equals("short")) {
+ solverConfig = SHORT_SOLVER_BENCHMARK_CONFIG;
+ } else {
+ solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
+ }
+ new NQueensBenchmarkApp(solverConfig, SOLVER_BENCHMARK_RESULT_FILE).process();
}
public ExaminationBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml 2008-02-09 11:45:13 UTC (rev 18438)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml 2008-02-09 15:15:46 UTC (rev 18439)
@@ -4,30 +4,44 @@
<solvedSolutionFilesDirectory>local/data/itc2007/examination/solved</solvedSolutionFilesDirectory>
<sortSolverBenchmarks>true</sortSolverBenchmarks>
<!-- solverBenchmarkResultComparator -->
-
+
<inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set1_initialized.xml</inheritedUnsolvedSolutionFile>
<inheritedLocalSearchSolver>
<scoreDrl>/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl</scoreDrl>
<scoreCalculator>
- <scoreCalculatorType>HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
+ <scoreCalculatorType>DYNAMIC_HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
</scoreCalculator>
<startingSolutionInitializerClass>org.drools.solver.examples.itc2007.examination.solver.solution.initializer.ExaminationStartingSolutionInitializer</startingSolutionInitializerClass>
<finish>
- <maximumStepCount>500</maximumStepCount>
+ <maximumStepCount>100</maximumStepCount>
</finish>
</inheritedLocalSearchSolver>
<solverBenchmark>
<localSearchSolver>
<selector>
- <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.PeriodChangeExaminationMoveFactory</moveFactoryClass>
- <shuffleMovesEveryStep>true</shuffleMovesEveryStep>
+ <selector>
+ <topSize>10</topSize>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.PeriodChangeExaminationMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.RoomChangeExaminationMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.ExamSwitchExaminationMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
+ </selector>
</selector>
<accepter>
- <accepterType>SIMULATED_ANNEALING</accepterType>
+ <completeSolutionTabuSize>500</completeSolutionTabuSize>
+ <completePropertyTabuSize>10</completePropertyTabuSize>
</accepter>
<forager>
- <foragerType>FIRST_RANDOMLY_ACCEPTED</foragerType>
+ <foragerType>MAX_SCORE_OF_ALL</foragerType>
</forager>
</localSearchSolver>
</solverBenchmark>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml 2008-02-09 11:45:13 UTC (rev 18438)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml 2008-02-09 15:15:46 UTC (rev 18439)
@@ -30,20 +30,6 @@
</finish>
</inheritedLocalSearchSolver>
- <!--<solverBenchmark>-->
- <!--<localSearchSolver>-->
- <!--<selector>-->
- <!--<moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.PeriodChangeExaminationMoveFactory</moveFactoryClass>-->
- <!--<shuffleMovesEveryStep>true</shuffleMovesEveryStep>-->
- <!--</selector>-->
- <!--<accepter>-->
- <!--<accepterType>SIMULATED_ANNEALING</accepterType>-->
- <!--</accepter>-->
- <!--<forager>-->
- <!--<foragerType>FIRST_RANDOMLY_ACCEPTED</foragerType>-->
- <!--</forager>-->
- <!--</localSearchSolver>-->
- <!--</solverBenchmark>-->
<solverBenchmark>
<localSearchSolver>
<scoreCalculator>
Modified: labs/jbossrules/trunk/drools-solver/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/pom.xml 2008-02-09 11:45:13 UTC (rev 18438)
+++ labs/jbossrules/trunk/drools-solver/pom.xml 2008-02-09 15:15:46 UTC (rev 18439)
@@ -59,18 +59,18 @@
<!-- Uncomment to depend on a stable release of drools-core and drools-compiler -->
<dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-core</artifactId>
- <version>4.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-compiler</artifactId>
- <version>4.0.4</version>
- </dependency>
- </dependencies>
+ <!--<dependencies>-->
+ <!--<dependency>-->
+ <!--<groupId>org.drools</groupId>-->
+ <!--<artifactId>drools-core</artifactId>-->
+ <!--<version>4.0.4</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.drools</groupId>-->
+ <!--<artifactId>drools-compiler</artifactId>-->
+ <!--<version>4.0.4</version>-->
+ <!--</dependency>-->
+ <!--</dependencies>-->
</dependencyManagement>
</project>
More information about the jboss-svn-commits
mailing list