[jboss-svn-commits] JBL Code SVN: r33009 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main: resources/org/drools/planner/examples/curriculumcourse/benchmark and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: ge0ffrey
Date: 2010-05-22 04:53:05 -0400 (Sat, 22 May 2010)
New Revision: 33009

Added:
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml
Removed:
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseShortSolverBenchmarkConfig.xml
Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseBenchmarkApp.java
Log:
curriculumcourse: stepLimit

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseBenchmarkApp.java	2010-05-22 08:46:20 UTC (rev 33008)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseBenchmarkApp.java	2010-05-22 08:53:05 UTC (rev 33009)
@@ -12,15 +12,21 @@
 
     public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
             = "/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml";
-    public static final String SHORT_SOLVER_BENCHMARK_CONFIG
-            = "/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseShortSolverBenchmarkConfig.xml";
+    public static final String STEP_LIMIT_SOLVER_BENCHMARK_CONFIG
+            = "/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml";
     public static final File SOLVER_BENCHMARK_RESULT_FILE
             = new File("local/data/curriculumcourse/curriculumCourseSolverBenchmarkResult.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;
         }
@@ -31,4 +37,4 @@
         super(solverBenchmarkConfig, resultFile, CurriculumCourseSchedule.class);
     }
 
-}
\ No newline at end of file
+}

Deleted: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseShortSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseShortSolverBenchmarkConfig.xml	2010-05-22 08:46:20 UTC (rev 33008)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseShortSolverBenchmarkConfig.xml	2010-05-22 08:53:05 UTC (rev 33009)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solverBenchmarkSuite>
-    <solvedSolutionFilesDirectory>local/data/curriculumcourse/solved</solvedSolutionFilesDirectory>
-    <!-- solverBenchmarkResultComparator -->
-
-    <inheritedUnsolvedSolutionFile>data/curriculumcourse/unsolved/comp01_initialized.xml</inheritedUnsolvedSolutionFile>
-
-    <inheritedLocalSearchSolver>
-        <scoreDrl>/org/drools/planner/examples/curriculumcourse/solver/curriculumCourseScoreRules.drl</scoreDrl>
-        <startingSolutionInitializerClass>org.drools.planner.examples.curriculumcourse.solver.solution.initializer.CurriculumCourseStartingSolutionInitializer</startingSolutionInitializerClass>
-        <termination>
-            <maximumStepCount>500</maximumStepCount>
-        </termination>
-    </inheritedLocalSearchSolver>
-
-    <solverBenchmark>
-        <localSearchSolver>
-            <scoreDefinition>
-                <scoreDefinitionType>HARD_AND_SOFT</scoreDefinitionType>
-            </scoreDefinition>
-            <selector>
-                <selector>
-                    <topSize>10</topSize>
-                </selector>
-                <selector>
-                    <moveFactoryClass>org.drools.planner.examples.curriculumcourse.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
-                    <relativeSelection>0.002</relativeSelection>
-                </selector>
-                <selector>
-                    <moveFactoryClass>org.drools.planner.examples.curriculumcourse.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
-                    <relativeSelection>0.002</relativeSelection>
-                </selector>
-                <selector>
-                    <moveFactoryClass>org.drools.planner.examples.curriculumcourse.solver.move.factory.LectureSwitchMoveFactory</moveFactoryClass>
-                    <relativeSelection>0.002</relativeSelection>
-                </selector>
-            </selector>
-            <acceptor>
-                <completeSolutionTabuSize>1500</completeSolutionTabuSize>
-                <!--<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/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml (from rev 32994, labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseShortSolverBenchmarkConfig.xml)
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml	                        (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml	2010-05-22 08:53:05 UTC (rev 33009)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solverBenchmarkSuite>
+    <solvedSolutionFilesDirectory>local/data/curriculumcourse/solved</solvedSolutionFilesDirectory>
+    <!-- solverBenchmarkResultComparator -->
+
+    <inheritedUnsolvedSolutionFile>data/curriculumcourse/unsolved/comp01_initialized.xml</inheritedUnsolvedSolutionFile>
+
+    <inheritedLocalSearchSolver>
+        <scoreDrl>/org/drools/planner/examples/curriculumcourse/solver/curriculumCourseScoreRules.drl</scoreDrl>
+        <startingSolutionInitializerClass>org.drools.planner.examples.curriculumcourse.solver.solution.initializer.CurriculumCourseStartingSolutionInitializer</startingSolutionInitializerClass>
+        <termination>
+            <maximumStepCount>2000</maximumStepCount>
+        </termination>
+    </inheritedLocalSearchSolver>
+
+    <solverBenchmark>
+        <localSearchSolver>
+            <scoreDefinition>
+                <scoreDefinitionType>HARD_AND_SOFT</scoreDefinitionType>
+            </scoreDefinition>
+            <selector>
+                <selector>
+                    <topSize>10</topSize>
+                </selector>
+                <selector>
+                    <moveFactoryClass>org.drools.planner.examples.curriculumcourse.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>
+                    <relativeSelection>0.002</relativeSelection>
+                </selector>
+                <selector>
+                    <moveFactoryClass>org.drools.planner.examples.curriculumcourse.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>
+                    <relativeSelection>0.002</relativeSelection>
+                </selector>
+                <selector>
+                    <moveFactoryClass>org.drools.planner.examples.curriculumcourse.solver.move.factory.LectureSwitchMoveFactory</moveFactoryClass>
+                    <relativeSelection>0.002</relativeSelection>
+                </selector>
+            </selector>
+            <acceptor>
+                <completeSolutionTabuSize>1500</completeSolutionTabuSize>
+                <!--<completeSolutionTabuSize>500</completeSolutionTabuSize>-->
+                <!--<completePropertyTabuSize>10</completePropertyTabuSize>-->
+            </acceptor>
+            <forager>
+                <foragerType>MAX_SCORE_OF_ALL</foragerType>
+            </forager>
+        </localSearchSolver>
+    </solverBenchmark>
+</solverBenchmarkSuite>