[jboss-svn-commits] JBL Code SVN: r19212 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main: resources/org/drools/solver/examples/itc2007/curriculumcourse/benchmark and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Mar 23 07:03:10 EDT 2008
Author: ge0ffrey
Date: 2008-03-23 07:03:09 -0400 (Sun, 23 Mar 2008)
New Revision: 19212
Added:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/app/CurriculumCourseBenchmarkApp.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/benchmark/curriculumCourseShortSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml
Modified:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationSolverConfig.xml
Log:
cc benchmarkapp
Copied: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/app/CurriculumCourseBenchmarkApp.java (from rev 19190, 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/curriculumcourse/app/CurriculumCourseBenchmarkApp.java (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/app/CurriculumCourseBenchmarkApp.java 2008-03-23 11:03:09 UTC (rev 19212)
@@ -0,0 +1,34 @@
+package org.drools.solver.examples.itc2007.curriculumcourse.app;
+
+import java.io.File;
+
+import org.drools.solver.examples.common.app.CommonBenchmarkApp;
+import org.drools.solver.examples.nqueens.app.NQueensBenchmarkApp;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class CurriculumCourseBenchmarkApp extends CommonBenchmarkApp {
+
+ public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
+ = "/org/drools/solver/examples/itc2007/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml";
+ public static final String SHORT_SOLVER_BENCHMARK_CONFIG
+ = "/org/drools/solver/examples/itc2007/curriculumcourse/benchmark/curriculumCourseShortSolverBenchmarkConfig.xml";
+ public static final File SOLVER_BENCHMARK_RESULT_FILE
+ = new File("local/data/itc2007/curriculumcourse/curriculumCourseSolverBenchmarkResult.xml");
+
+ public static void main(String[] args) {
+ 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 CurriculumCourseBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
+ super(solverBenchmarkConfig, resultFile);
+ }
+
+}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/benchmark/curriculumCourseShortSolverBenchmarkConfig.xml (from rev 19194, 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/curriculumcourse/benchmark/curriculumCourseShortSolverBenchmarkConfig.xml (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/benchmark/curriculumCourseShortSolverBenchmarkConfig.xml 2008-03-23 11:03:09 UTC (rev 19212)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solverBenchmarkSuite>
+ <solvedSolutionVerbosity>ALL</solvedSolutionVerbosity>
+ <solvedSolutionFilesDirectory>local/data/itc2007/curriculumcourse/solved</solvedSolutionFilesDirectory>
+ <sortSolverBenchmarks>true</sortSolverBenchmarks>
+ <!-- solverBenchmarkResultComparator -->
+
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp01_initialized.xml</inheritedUnsolvedSolutionFile>
+
+ <inheritedLocalSearchSolver>
+ <scoreDrl>/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseScoreRules.drl</scoreDrl>
+ <scoreCalculator>
+ <scoreCalculatorType>HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
+ </scoreCalculator>
+ <startingSolutionInitializerClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.solution.initializer.CurriculumCourseStartingSolutionInitializer</startingSolutionInitializerClass>
+ <finish>
+ <maximumStepCount>100</maximumStepCount>
+ </finish>
+ </inheritedLocalSearchSolver>
+
+ <solverBenchmark>
+ <localSearchSolver>
+ <scoreCalculator>
+ <scoreCalculatorType>DYNAMIC_HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
+ </scoreCalculator>
+ <selector>
+ <selector>
+ <topSize>10</topSize>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory.LectureSwitchMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
+ </selector>
+ </selector>
+ <accepter>
+ <completeSolutionTabuSize>1500</completeSolutionTabuSize>
+ <!--<completeSolutionTabuSize>500</completeSolutionTabuSize>-->
+ <!--<completePropertyTabuSize>10</completePropertyTabuSize>-->
+ </accepter>
+ <forager>
+ <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ </forager>
+ </localSearchSolver>
+ </solverBenchmark>
+</solverBenchmarkSuite>
Copied: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml (from rev 19194, 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/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml 2008-03-23 11:03:09 UTC (rev 19212)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solverBenchmarkSuite>
+ <solvedSolutionVerbosity>ALL</solvedSolutionVerbosity>
+ <solvedSolutionFilesDirectory>local/data/itc2007/curriculumcourse/solved</solvedSolutionFilesDirectory>
+ <sortSolverBenchmarks>true</sortSolverBenchmarks>
+ <!-- solverBenchmarkResultComparator -->
+
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp01.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp02.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp03.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp04.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp05.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp06.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp07.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp08.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp09.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp10.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp11.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp12.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp13.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp14.xml</inheritedUnsolvedSolutionFile>
+
+ <inheritedLocalSearchSolver>
+ <scoreDrl>/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseScoreRules.drl</scoreDrl>
+ <scoreCalculator>
+ <scoreCalculatorType>HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
+ </scoreCalculator>
+ <startingSolutionInitializerClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.solution.initializer.CurriculumCourseStartingSolutionInitializer</startingSolutionInitializerClass>
+ <finish>
+ <!--
+ Official benchmark maximumSecondsSpend allowed on:
+ ge0ffrey's main pc: 429
+ ge0ffrey's old pc: 1152
+ -->
+ <maximumSecondsSpend>30</maximumSecondsSpend>
+ </finish>
+ </inheritedLocalSearchSolver>
+
+ <solverBenchmark>
+ <localSearchSolver>
+ <scoreCalculator>
+ <scoreCalculatorType>DYNAMIC_HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
+ </scoreCalculator>
+ <selector>
+ <selector>
+ <topSize>10</topSize>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
+ </selector>
+ <selector>
+ <moveFactoryClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory.LectureSwitchMoveFactory</moveFactoryClass>
+ <relativeSelection>0.002</relativeSelection>
+ </selector>
+ </selector>
+ <accepter>
+ <completeSolutionTabuSize>1500</completeSolutionTabuSize>
+ <!--<completeSolutionTabuSize>500</completeSolutionTabuSize>-->
+ <!--<completePropertyTabuSize>10</completePropertyTabuSize>-->
+ </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/itc2007/examination/solver/examinationSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationSolverConfig.xml 2008-03-23 10:33:27 UTC (rev 19211)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationSolverConfig.xml 2008-03-23 11:03:09 UTC (rev 19212)
@@ -33,7 +33,9 @@
</selector>
</selector>
<accepter>
- <completeSolutionTabuSize>1500</completeSolutionTabuSize>
+ <!--<completeSolutionTabuSize>1500</completeSolutionTabuSize>-->
+ <completeSolutionTabuSize>500</completeSolutionTabuSize>
+ <completePropertyTabuSize>10</completePropertyTabuSize>
</accepter>
<forager>
<foragerType>MAX_SCORE_OF_ALL</foragerType>
More information about the jboss-svn-commits
mailing list